Merge "Don't crash system with exception from onServiceChanged"