Merge "Move status bar above keyguard."