Merge "Merge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11 am: f94abc1009  -s ours am: 3a3417dd7e"