Pick-to: 6.3 Pick-to: 6.2 Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>