Merge "Revert "Fix force close for updating UI after activity destroyed."" into main