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

* commit '06749c2bc878f1359b09c28be2efae87405a923f':
  Fix flash caused by frame resize code