Merge "StatusBar: Make sure showKeyguard is called when needed"