Merge "Multiuser settings revamp - followup to address comments"