Merge "Add workaround to handle overlay package changes for non-primary users" into qt-dev