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

* commit 'c88ba2ec617ba7e9b156888c980c1f9044d32726':
  set correct url icon when setting tab