Merge "MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS when doing default permission grants" into qt-dev