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