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

Change-Id: Ide81e21c24c6efd66c03c997dcaefbd0a3efd7b8