Merge "Remove app attribution UI for FSI" into udc-dev