Merge "Fix activity config tests in ActivityThreadTest"