Merge "Fixes memory leak and NPE crash issue (1/3)." into tm-qpr-dev