Merge "Notifications channels are not locked at first boot"