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

Change-Id: I1bd80144fcb30dae02d00656367d0d5a155ea3a2