Merge "Prevent onHandleDestroyed from being called w/ mStateLock" into qt-dev
am: 59d9d5fcab

Change-Id: I0b817bd5c3e0341c2db6645244d98c9f5a70100b