Merge "Fix potential issue where sub info change listener is not registered."