Merge "Add a flag for PS sensitive notifications toggle in settings" into main