Merge "Add feature to enable separate personal/work profile settings"