Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev