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