Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev