am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
  fix ellipse logic for portrait