Merge "Fix Night display QSTile for secondary users" into nyc-mr1-dev