Merge "Wait for input windows to be set before proceeding with inject for tests"