Merge "Add logging constant to track settings slice changes" into pi-dev