Merge "Extract SimChangeListener to its own file"