Merge "Changes Controller to use Tab.getUrl in more places" into honeycomb