Pick-to: dev Change-Id: I320adf737c7ac9da45e27b30b385318f1d925905 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>