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

* commit '4c2e3491ec6cf20bcf95a922f396473e33bc4e98':
  ActivityTransition: Encode scaleType and matrix in snapshot view