Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev