Merge "Prevent HandlerThread from losing interrupted flag"