Merge "[OWE] Support OWE in transition mode" into qt-dev