Merge "Disable scaling on decoding bitmap reuse format test" into klp-dev