Merge "Fix bug with getting widget categories" into jb-mr1-dev