Merge "Settings Drawer: Support multi-user changes"