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

Change-Id: I461d442072c42aa4feac58c68dac068f6bb61d67