Merge "Remove TODO which is resolved by changes in ZenModeHelper" into main