Merge "Fix NPE when calling setState() before onLayoutChild()"
am: db454aa9d4

* commit 'db454aa9d482e95e0603f5b86280f343a06bf564':
  Fix NPE when calling setState() before onLayoutChild()