Merge "DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"" into qt-r1-dev