Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev