Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev