am 5a557a61: Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev

* commit '5a557a61d6a5cd2d82dcd961b1d72b5621eb014d':
  Fix virtual displays for HWC<=1.1