Merge "Settings Drawer: Handle multi-profile/user correctly"