Merge "Refactored CustomVirtualView to be more generic..." into oc-dev am:...
Merge "Refactored CustomVirtualView to be more generic..." into oc-dev am: 490b7111 am: b17707e1 am: cae69427
am: 976aff57
Change-Id: I7562c78ed864fb36f26ba746cd2e27fdd6d5a5c9