Merge "SnapdragonCamera: fix a thumbnail update issue"