[update] Mege from upstream qtwayland e48ea148