Merge "Blank or unblank all displays as need." into jb-mr1-dev