Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev