Merge "Fix broken tests in DocumentsUI."