Pick-to: 6.2 6.3 Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>