Merge "Pause ViewFlippers while lock screen is showing" into main