Merge "Part of fixing Splashcreen cts tests" into sc-v2-dev