Merge "Reset setIgnoreDisplayTouches on UdfpsOverlay show/hide" into main