am cfca686a: Merge "Rotate fallback size" into klp-dev

* commit 'cfca686ae8e64bda44a370232f3ba367e6e520d1':
  Rotate fallback size