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