Merge "Don\'t change geometry in relayout if preserve geometry is requested" into nyc-dev
am: 3db51d1

* commit '3db51d19990485be0baa191e4c616ca2367dadf2':
  Don't change geometry in relayout if preserve geometry is requested