Merge "Missed a spot, needInput was not getting called." into jb-mr1-dev