Merge "Add content description for expand name fields button" into jb-mr1.1-dev