Merge "Fix the size of the handle and touch area." into main