Merge "Fix IsolatedSplitAppTests"