Merge "Implement tap to resize for edit mode" into main