Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev