Merge "[DO NOT MERGE] Transitions: PRIMARY_BOUNCER -> GONE" into tm-qpr-dev