am 7a6eb7f1: Merge "Prevent going into single contact mode un-necessarily." into jb-mr1.1-dev

* commit '7a6eb7f1e62546a5b785ba6492498bebb3adf1dd':
  Prevent going into single contact mode un-necessarily.