Merge "Flag off new Chooser behavior."