Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev