Merge "Let dumpstate call "cmd window trace save-for-bugreport""