am 1dbdb0e8: am 2932ace3: Merge "hwc: enforce minimum window width" into jb-mr1-dev