Merge "Fix error message on Flicker's launchSplitActivity test"