Merge "[bc25] Update KeyguardDismissActionInteractor to account for overlays." into main