refs #30452, #30453
refs #30544
Merge pull request #116 from aipocom/bugfix/todo-android-searchbox

refs #30452, #30453