Merge "Organize multi-window enabling" into oc-dev am: cad3c3251c
am: 33c786b80a

Change-Id: Ic302d18b58397e98d48258120b0eb67f22f0db07