am b383438b: am a525483d: Merge "Fix a bug where non-cropped layer could be...
am b383438b: am a525483d: Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
* commit 'b383438b':
Fix a bug where non-cropped layer could be scaled incorrectly