Merge "Change variable name fix from 'endingListener' to 'endListener'"