Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev