am 70f07572: am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev

* commit '70f07572f8ce6b83b167170eea9d500e51549395':
  don't automatically unblank external displays