Merge "Make sure the removeObservers be called correctly" into sc-dev