Merge "Only modify window layout params when necessary." into cw-f-dev