Merge latest omnirom patches for multiwindow

Change-Id: I2116840552cfd9c01d6d0b8dd84021124997d97d
Merge remote-tracking branch 'th/jb-mr2' into HEAD