Merge "Add work profile support to chooser selector" into tm-qpr-dev