Merge "Add soft support for height/width/orientation columns for picker uris" into tm-mainline-prod