Fixed resize bug
Merge branch 'master' of https://github.com/sukhada/15239