Merge "Fix disable flag in QSBH" into sc-v2-dev