Merge "Pass through onTransitionConsumed in OneShotRemoteHandler" into main