Merge "hwc2 : Correcting primary display count handling"