Merge "Remove FLAG_ENABLE_CHOOSER_RESULT" into main