Merge "Clone profile badge resolution in settings." into udc-dev