Pick-to: 6.8 Change-Id: I630cdc7bbff320c6ca8e17b33f0e9fc05f6a63af Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>