Merge "Remove filterNonTouchAsIs function"