Merge "Add (displays) sensitive content concept to the View" into main