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