Merge "Execute afterPrepareSurfacesRunnables after committing the transaction" into main