Merge "Increase frame limit for bubble bar screen test" into main