Merge "Add jeffdq@ to core/res/OWNERS to support notification template work" into main