Merge "Guard regionSampler registering/deregistering code behind the flag." into tm-qpr-dev