Merge "Revert "Fix ShadeTouchHandler over the lock screen"" into main