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

* commit 'a52b6e7bcf5ee6e80a4443f19b31a3df0ec4e518':
  Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.