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