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

Change-Id: I79b6d8092045aa4d413e5f7b2e2e4b3b23164f43