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

Change-Id: I2eda66d48b148156f8e6b2dc0a29bd1256ffbc16