Merge "Clean-up old docked-stack implementation from WM" into rvc-dev