Merge "Handle post-record-time clipPath scaling" into nyc-mr1-dev