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

Change-Id: I21c7d62b1cb775a2992d4abcf5c4cfdae91c09a3