Merge "Fix NPE when calling setState() before onLayoutChild()"