Merge "Back up Night Light settings" into nyc-mr1-dev