Fix flaky BBQ tests

Updates several tests to use transaction committed callbacks and BBQ's mergeWithNextTransaction to correctly wait before taking screenshots.

Bug: 288344458
Test: tested the updated tests with at least 200 runs each
Change-Id: I821d8673162ec22be6c3060e24491c3ee4941640