Merge "Convert bouncer ui tests" into main