Merge "Remove "Night mode" from tuner" into nyc-mr1-dev