Merge "Revert "Execute afterPrepareSurfacesRunnables after committing the transaction"" into 24D1-dev