Merge "sdm/hwc: add display indices property for client id init"