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