Merge "Add UdfpsTouchOverlay (replacement for UdfpsView)" into main