Merge "Make IOnAssociationsChangedListener.onAssociationsChanged() blocking"