Merge "Support toggling layer caching at runtime" into sc-dev