Merge "Fix edge case in onTransactionIdle()"