Merge "Fix crash when updating ranking model in ChooserActivity."