Merge "Add missing contentDescription" into jb-mr1-dev