Merge "Fix `break` location for WM Service message handler"