Merge "Don't save policy file for every notif channel creation" into qt-dev