Merge "Optionally wait animations on syncInputTransactions/injectInputEvent"