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