Merge changes from topic "am-644c7f5464e44a4ca8b44b00b3f87272"

* changes:
  [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f2 am: b618fee4 -s ours am: fa7e3ae7 -s ours am: a10aa3cc -s ours am: 9ed0b1cc -s ours am: f6adfc4e -s ours am: 534720e5 -s ours am: f1aaf7a4 -s ours am: cf1121ed -s ours am: 125dcf16 -s ours
  [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92 am: 8a021141 am: b953b5ef -s ours am: 1cb919e3 -s ours am: 5f6329c8 -s ours am: ad8cb29b -s ours am: 9cc147f6 -s ours am: c358dbf4 -s ours am: cba12d10 -s ours am: e195ec6e -s ours
  [automerger skipped] Store DND rule owners am: eda171cf am: 1eaa4435 -s ours am: 8e552b10 -s ours am: d75bba0c -s ours am: 3a3afbd5 -s ours am: d8b7ea00 -s ours am: a88acd5c -s ours am: 4be00665 -s ours am: 4cb5a840 -s ours am: f50ce4c3 -s ours