Merge "Cleaned-up RootWindowContainer.applySurfaceChangesTransaction"