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