Merge "Remove USE_REPOS_FOR_BOUNCER_SHOWING flag." into main