Merge "Check that HWC exists before trying to use it" into jb-mr1-dev