Merge "Don't activate VVM if carrier config changed without signal" into nyc-mr2-dev