Merge "Fix NPEs in detached views." into honeycomb