Merge "Adding the SurfaceView on splash screen thread." into sc-v2-dev