Merge "Prevent action-bar icons from changing while QuickContacts active." into jb-dev