Merge "Move listener registration out of constructor." into sc-dev