Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev