Merge "Rotate fallback size" into klp-dev