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

Change-Id: Ic7a4976186161c80ba02e1b59d8898f8765b50f3