Merge "revert conflict commits from AU053" into qt-qpr1-dev