Merge "Move work profile security settings to bottom of list" into sc-dev