Merge "Revert "[omni] Handle touch slop for LPAA."" into main