Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev