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

* commit '979170441191f4c0fa292def1f2124bd62f70ffb':
  Cache account prefs so we don't lose a11y focus

Change-Id: I475b564279160e4100008fb6affb48d1659de05f