Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev