Merge "Retrying the remoteview application on the ui thread" into oc-dev am: 07b93779ba
am: 12a9c8eac6

Change-Id: I65434b26ed8129bd8d1a105f7c4773996b9f9b32