Merge "Change selection highlight for intent disambig dialog" into klp-dev