Merge "Fixed irregular talkback navigation in shortcut helper" into main