Merge "Don't enable input dispatch until display enabled." into jb-dev