Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev