Merge "Update light mode when battery saver changes" into nyc-mr1-dev