am 36fb59b1: Merge "Improve type propagation with if-contexts"

* commit '36fb59b15fbca20c22e9daf2943fcfeebc97848f':
  Improve type propagation with if-contexts