Merge "Block signals before invoking special or user handlers"
am: 69d6b1f1e6

* commit '69d6b1f1e6538970aeefb0a63cb0619dac9ee7c2':
  Block signals before invoking special or user handlers