Merge "Fix more coretests in light of no-initial-focus"