Merge change 23093 into eclair

* changes:
  Revert the new back behavior change. It was causing views to not go to the right time. b/2077287 b/2076791