Merge "Removed urlBarResourceId." into pi-dev am: 3a31f6c5cc
am: e40a0838ba

Change-Id: I13688d0b8ce95910eae74e814030b78e28054be8