Merge "Fix test flakiness of SplashScreenExceptionListTest"