Merge "Fix issue with accessibility when switching users"