Merge "Scan volume based on volume state changes, not broadcasts." into sc-dev