Merge "Document dependency between Intent symbols and dumpstate"