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