Merge \"Handle post-record-time clipPath scaling\" into nyc-mr1-dev
am: a6b011e9b0

Change-Id: Icdf0cb748953c9ad1db57b748719f4c93429e78a