Merge "Show correct text for old zen modes" into qt-dev