Merge "[Notif] Remove old blocking helper button" into pi-dev am: a0a7a86acf
am: 5649a0f76b

Change-Id: I53d75f31554a77b5a054f5a71b632e5c03e99a7e