Merge "Add content description to More options button" into jb-mr1.1-dev