Merge "Deprecate FLAG_DISMISS_KEYGUARD"