[US144] Merge from branch/pinch_to_zoom_n_rotate