Merge "Zen: Update condition text for current condition." into lmp-mr1-dev