Merge "Not to show intermediate screen to the user when dismissing split screen"