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

* commit '02e4c3a1d870be7ced0f70f460d718924f6e348f':
  Cache Scene objects by layout ID on the scene root