Merge "Add tests for device config changes" into sc-dev