Merge "CP ag/9571636 from master to qt-qpr1-dev Bug: 143299398" into qt-qpr1-dev