Merge "Do not handle touches next to shelf Take #2" into main