Merge "3/ Update OneHanded to use shell main thread"