Merge "Return: Always show battery on Keyguard [1/2]" into kk4.4