Merge "Don't reset layout params when repositioning" into nyc-mr1-dev