Merge "Fix issue with the component layout not having updated on config...
Merge "Fix issue with the component layout not having updated on config change" into nyc-dev am: 59917dfb
am: 49d38f21
* commit '49d38f21':
Fix issue with the component layout not having updated on config change