Merge "Fix bug that clickling buttons on spam notification has no effect." am: 016e53f6ec
am: 5f5edeff75

Change-Id: Ib6731eb8b91bcaafa22d2fc0c408942fe075417d