Merge "sdm: hwc_session: Make display members polymorphic"