Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo