Merge "Update split screen UI to support light theme." into udc-dev