Merge "Fix height and top padding of shade header and keyguard status bar" into main