am a0b2c039: am 06749c2b: am 8ac67e62: Merge "Fix flash caused by frame resize code" into klp-dev

* commit 'a0b2c0398e4bd9ed5f57d39296afc56950fc02c4':
  Fix flash caused by frame resize code