Merge "Improve code sinking near "always throwing" method calls"