Merge "Fix the battery icon on the battery page when low battery"