am 1b20b8e6: am b3abe7c0: Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev

* commit '1b20b8e694a8019fd8da1c25323734c15ae9171b':
  Incorporate TransformToDisplayInverse into the crop calculation.