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