Merge "Close QS Detail before hiding QS." into sc-dev