UOWs now only invoke on the UI thread when necessary

Change-Id: I09e3387b4927acdcbbef231075a3206858972bf0