Merge "add support for height/width/orientation in picker uri" into tm-mainline-prod