Merge "Do not throw exception when there is no tile for category."

    public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey) {

    public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey) {

        tryInitCategories(context);

        tryInitCategories(context);

        final DashboardCategory category = mCategoryByKeyMap.get(categoryKey);

        return mCategoryByKeyMap.get(categoryKey);

        if (category == null) {

            throw new IllegalStateException("Can't find category with key " + categoryKey);

        }

        return category;

    }

    }

    public synchronized List<DashboardCategory> getCategories(Context context) {

    public synchronized List<DashboardCategory> getCategories(Context context) {