Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: d56887f8fa" into nyc-mr2-dev-plus-aosp