Make sure state changes are made on main thread.

Make sure state changes are made on main thread. #659