Merge "Avoid un-registration when mRealInstrumentation is null." into tm-qpr-dev