Merge "Show prompt to user to exit split screen" into udc-dev