Merge "Fix race while setting ASyncNotify callback" into tm-qpr-dev