Resolve conflict between resizing and chrome buttons
Merge branch 'dev'