Merge "Enable context virtualization only for GL" am: 48880d51d0 am: 6630407efa

Change-Id: Id384b685e8ac218cdeb1d33d36f62f648ea1d5a3