Merge "Remove MODERN_BOUNCER flag." into tm-qpr-dev