Merge "Use same calculation for portrait as fake landscape for layout of split thumbnails" into udc-dev