Merge "Cache Scene objects by layout ID on the scene root" into klp-dev