Merge "Do not letterbox the activity in PiP mode" into udc-dev