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

* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays