Merge "Fix a bug where Settings would crash from search into storage."