Merge "Fix incorrect tab highlight in QuickContactActivity." into jb-mr1.1-dev