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