Added patches for disabling and changing notification timeout