Merge "Remove duplicated entry for DialogStubActivity."