automerge: edad58b
* commit 'edad58bc61fd4b54b6581f32f063321fcbd58cac':
Zen: Fix selection logic for "Indefinitely".
automerge: edad58b
* commit 'edad58bc61fd4b54b6581f32f063321fcbd58cac':
Zen: Fix selection logic for "Indefinitely".