Merge "Serialize key eviction vs. user storage preparation" into pi-dev