Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev