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

Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005