Merge "Hide search results when Battery info page is disabled." into main