Merge "Workaround a notification inflation race condition." into tm-qpr-dev