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

Change-Id: Ib66a74a513b0bdc5057a402cbf935ddd2b6a3cb2