Merge "hwc2: Do not delete hwc_session"