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

Change-Id: Ic039210e17b1f49d4232b97acdd46befcbd896d3