Merge "Fix SplashscreenTests#testSplashscreenContent in the multi display env." into rvc-dev