am 4509e3d2: (-s ours) am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '4509e3d2e7741e33fc3fa1bb168ab7dfa95aba7a':