[US144] Merge cleanup part of pinch_to_zoom_n_rotate branch