Merge "Adding privacy indicators to split shade header"