Merge "Simplify check-behind-fullscreen-activity"