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

Change-Id: I20e456309ddae5f1a75b309726807295c414a6d3