Merge "Fix AppPrediction/Smartspace leak" into tm-qpr-dev