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

Change-Id: I6e3695c245ed6afb208c0bd422b0ed2ac840281f