Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev