Merge "Preventing NPE crash if view is detached from window." into tm-dev