Merge "Retry getting DynamicSystem service" into qt-dev