Merge "Update string for battery optimization dialog"