Merge "Remove CounterRotator surface in finishTransaction"