Merge "hwc: Add support for new resolutions"