Merge "Change zen mode schedules page rule handling" into tm-dev