Merge "Use desktop API to remove desktop for dismiss" into main