Merge "Use themed context to inflate user switcher items" into sc-dev