Merge "Revert^2 "Defer destroy activity if it is in transition."" into main