Merge "Fix setting_about_main_get_battery_string to be platform specific" into 2...