Merge "Add number back to legacy notifications." into jb-dev