Merge "Fix settings slice caching" into pi-dev