Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev