Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev