Merge "Fix scrim handling when dismissing Keyguard in occluded case"