Merge "Fix threading issue with splash screens" into oc-dr1-dev