Merge "sdm: hwc2 : Correcting the display Index handling"