Merge "Properly filter alert window notifications" into pi-dev am: cfa0f19fa1
am: 2bc9e4fdf3

Change-Id: Ia33b9dfe1399a7a787b6aa467edb9a7b74bde4be