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

Change-Id: Ic204ce482a8324367e8a27e3c332b5b5797321a5