Merge "Cleans up userId loop in clearPackageStateForUser" into qt-dev