Refactor #3370: Reverse change to FixedWidth and FixedHeight policy
Merge pull request #1415 from pandamicro/develop

Refactor #3370: Reverse change to FixedWidth and FixedHeight policy