Merge "Revert "Prevent notif flicker during entirety of swipe to unlock"" into main