Follow up CL for heads up notification refactoring

Change-Id: Iaf286dfd30a86d3d7d6dd947d3c10ac9eb8c2b1e
16 files changed