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

Change-Id: I56871d6a077e3fe42873304afa634e6e45cf7e60