Merge "Make the icon of SplashScreenView non-focusable" into main