Merge "Add more testing for ResourceManagerService" into qt-qpr1-dev