Merge "Increase the persistent storage size for SkSL Shaders" into sc-dev