Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev