Merge "Add rotary dismiss button to HUNs" into rvc-qpr-dev