[update] Merge from upstream qtwayland e48ea148