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

Change-Id: I737b16c2c7a990dc808bfa6af297288c40e1e934