This is a version of the multi window patch minus Android Studio changes.
Proguard changes are excluded since there is no config in the master branch
bumped version number