Merge "Handle config changes in NetworkController" into lmp-mr1-dev