Merge "Retrying the remoteview application on the ui thread" into oc-dev