Merge "Fix default clip to padding value Bug: 26779229" into nyc-dev