Merge "Battery Saver master case changes"