Merge "Catch reentrancy while executing postponed transactions." into nyc-support-25.2-dev am: 3776f73df5
am: 239af8f4bd

Change-Id: I01f3d98b08fd2c9d5ae597f272312eef6b4b21a0