Merge "Fixing StackView crash associated with DataSetObserver"