Merge "Don't change geometry in relayout if preserve geometry is requested" into nyc-dev