Merge "Revert "Remove filterNonTouchAsIs function""