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

* commit '228ae43d6aaf6e3e1053557b56d392ab0ce9e1ce':
  Prevent going into single contact mode un-necessarily.