Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev
am: 961492cc30
Change-Id: I5a1e9d04eaaacd63ffa5e6d9d7874c636b45addc
This commit is contained in:
am: 961492cc30
Change-Id: I5a1e9d04eaaacd63ffa5e6d9d7874c636b45addc