Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev