Merge "Revert "Re-land: Execute afterPrepareSurfacesRunnables after committing..."" into main