Merge "Hide no calling slot when QSBH expands" into sc-dev