Merge "Add mDestroyed null check" into main