Merge "Fix crash when user changes after a11yservice dies" into nyc-mr1-dev