Merge "Removed urlBarResourceId." into pi-dev