Merge "Fix NPE going from PiP to Fullscreen." into udc-dev