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

Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534