Merge "Remove guest after "Reset guest" is used in QS" into sc-dev