Merge "Make colorPrimary darker in Theme.DeviceDefault.Settings at night" into qt-dev am: e5b5f30f am: 1e7e4324 Change-Id: I50ad8baed8fd02807d225b59cd57543e51812366