Merge "Swipe to unlock - Fix alpha continuity" into main