Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev