Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev