Merge "[Settings] Save query status of search view" into main