Merge "[CredManUI] UI style P0 fixes" into udc-dev