Merge "Put package name in extra not data" into qt-qpr1-dev