Merge "Dismiss keyguard for SurfaceControlViewHostTests" into main