Merge "Fix transfer splash screen view been called twice from onDraw" into sc-v2-dev