Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."