Merge "Prevent onHandleDestroyed from being called w/ mStateLock" into qt-dev