Merge "Fix stuck notifications" into pi-dev
am: 2a8a4d56fe

Change-Id: I02c5094417924279d3ace10bea3db4ec55bf460f