Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev