Merge "Fix keyboard focus in VR" into oc-dr1-dev