Merge "Fix for resetting volume status"