Merge "Fix flash caused by frame resize code" into klp-dev