Merge "Allow mixed handler to handle transitions that might enter PIP" into udc-qpr-dev