Merge "Improves service state changed notification"