Merge "Revert "Do not handle touches next to shelf"" into main