Multi-window support

Change-Id: I9b3d737ba7efa4d3677baec18edf3eb36d49ba14