Merge "remove observer in destroy() bug:388189795" into main