Revert^3 "Improve App notification loading"

33710fd9e2893d2b7650f40006348319960a8318

Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
34 files changed