Merge "[Notif] Allow locking importance on notification" into pi-dev