Merge "Update sysuiResTag for user switcher UI elements" into main