Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev