Merge "Move Zen mode registerContentObserver calls to background handler." into main