Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev
am: ce7e3e3a90

Change-Id: Id0a0eb6757e5ddc0af7ad6844f78bbb0a51a8f58