Merge "Add battery level in status bar on Keyguard when charging"