Merge "Only create resources for the non-system user" into qt-dev