Merge "Guard against apps breaking CHOOSER contract." into jb-dev