Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev