Multi-window ported from omnirom 2.0

Just Updated with last changes from gerrit.omnirom.org