Merge "Restore keyguard status area header"