9c9c532d36
Also fix bug where night mode was being used in desk dock. Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261