Merge "Make GetActiveDsu() static inline"