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