Merge "Update alternate bouncer scrim values" into tm-qpr-dev