Merge "Add functional tests for FilesActivity."