Merge "Fix issue when starting FLAG_DISMISS_KEYGUARD while occluded"