Merge "Register ChildLocationsChangedListener on NSSL"