Merge "Use UdfpsOverlayInteractor.iconPadding for AltBouncerUdfps" into main