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