Merge "Add configuration parameters to control user switcher behavior" into main