Merge "AF/FR Fix onActivityResult condition."