Merge "Small cleanup for notifications" into ub-launcher3-dorval
am: 904166fd1e

Change-Id: I1f7eecf94ca6dd495e8ebdb3f0a98354a833678d