Merge "Pass forward listeners when using existing builder"