Merge "Ignore public volume state change event when user is null" into sc-dev