Merge "SnapdragonCamera: Add the 60fps support for preview"