Merge "Customize user switch dialog"