Merge "Fix Night display QSTile for secondary users" into nyc-mr1-dev
am: 76af60554c

Change-Id: Ie6d43f6ae549ca4d5235fb98a0a431b63858dd59