Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev