Merge "Fix a potential null-pointer onActivityDestroyed" into tm-qpr-dev