Merge "Force pending transactions to flush before screenshot." into nyc-dev