Merge "Make sure touch only goes to the nearest button when it makes sense" into main