Merge "add sensitive content protection flag to developer option" into main