Merge "Adding privacy indicators to split shade header" into sc-v2-dev