fix WM improvements feature, part 2
Merge branch 'master' of github.com:rhomobile/rhodes