Merge "Fix PrivacyChip not visible issue" into udc-dev