Back button doesn't change URL if view blocks the navigation (#10901)

Change-Id: Ib1211a7a2282753b329129615a544264e62d1ed5