Merge "fix app prediction service doesn't clean-up properly." into rvc-qpr-dev