Merge "Update bouncer visibility on altAuthBouncer changes" into tm-dev