Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1