Merge "Disallow loading icon from content URI to PipMenu" into udc-dev