Merge "Don't skip intents where config changed."