Merge "Conditionally block battery percantage from search" into pi-dev