Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev