Merge "Fix 2 tests broken by fragment migration."