am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
  ActivityTransition: Encode scaleType and matrix in snapshot view