Merge "New focus/activated states for the activity chooser dialog" into jb-dev