Revert^2 "Improve App notification loading"

c5f1cb11e0c895e1b62f8f3a0074cf30cfc7c4a8

Change-Id: I5a6d39e0a5f2b7bd30bcc12e207b8bb23857c6d8
34 files changed