Merge "don't automatically unblank external displays" into jb-mr1-dev