Merge "Initialize screen state earlier in the boot process." into jb-mr1-dev