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

* commit '7b6f51ec77a5693bd0e63831b2398bb37dff2e66':
  Block signals before invoking special or user handlers