Merge "Don't add the UdfpsView until after the device is finishedGoingToSleep" into main