Merge "Improve lifecycle of ZenModeFragment & friends" into main