Merge "Only call dismissCallback cancel on reset if bouncer is showing" into main