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