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

* commit 'a525483dc73df39a72c9b4865102a86704b3622c':
  Fix a bug where non-cropped layer could be scaled incorrectly