Merge "Should reset mDismissKeyguard on keyguard secure change"