Merge "Fix issue that default dialer change is broadcasted unintentionally"