Merge "Follow-up CL of ag/6935284, add entities to extras in generateLinks" into qt-dev