Merge "Minor getFutureForIntent fixes" into main