Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev