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

Change-Id: If49de6fe775e3e066ed3353e6a5b11acbdd8f83b