Merge "Don't consume swipe gesture if screen lock is not secure" into main