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

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