Merge "Do not deep copy bundle in getExtras()" into qt-dev