am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev

* commit '3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
  Deferring size callbacks until boot completed (issue 7469267)