Merge "DocumentsUI: Fix some test failures in DocumentsUITests" into pi-dev