Merge "Fix HDMI unblank behavior" into jb-mr1-dev