Merge "Update the APF capabilities on role change" into udc-dev