Merge "waitForInputThenPass helper"