Merge "Fix for an NPE in Account settings on long press." into honeycomb