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