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

* commit '484421ebf9d88f44d759cc0742d6da6948e63c47':
  Block signals before invoking special or user handlers