Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."