am 94355ed4: Merge "New hooks to allow layouts to improve their performance by doing more caching"

* commit '94355ed44a88d619f94948285a8dbe51ed7a7cb0':
  New hooks to allow layouts to improve their performance by doing more caching