Merge "Setting to toggle smart dialing on/off" into jb-mr2-dev