Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev