Merge "Perform initial grants on package change asynchronously" into qt-dev