Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev