Merge "SnapdragonCamera: Fix to make back key event work normally"