Merge "set correct url icon when setting tab" into honeycomb-mr1