Merge "Fix issue with the component layout not having updated on config change" into nyc-dev