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

* commit '88afb4413be728c1a454d5556d734c1634c908e7':
  Prevent going into single contact mode un-necessarily.