Merge "Null check for early watchdog-caught thread hangs" into qt-dev am: f4c2cb6830 am: 595f89eb01
am: 3d21e44a7a

Change-Id: I4177b7af16865692e53b678ecf56ac4e6498a1c6