Merge "Changes AppSearchHelper to only remove deleted app functions" into main