Merge "Persist notification blocker info across reboots"