Merge "Avoid isKeyguardShowing() before startKeyguard()"