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

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