Merge changes I378b7c38,I6c3f945e into main

* changes:
  Flag for sensitivecontent recents bugfixes
  Add flag for sensitive content metrics bugfixes