Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev