am 6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev

* commit '6d5b8e600e77164d3b5e51b89bf9c940fd7b4ea2':
  Clean up HWC state when releasing a DisplayDevice