am 0da9f412: (-s ours) am 2786da5c: DO NOT MERGE fix url bar update

* commit '0da9f412917cc3e817eb679ae028f763d89013db':
  DO NOT MERGE fix url bar update