Merge "Fix bug #13962001 Search - need to finish indexing "Data usage" Settings"