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

Change-Id: I54bb48ab3ac2efe53dd40904147b6b9396570b49