Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Prevent persistent task listing interruptions on IOExceptions Change-Id: Ie03efcc94ff8001edee557a6a413233085fab1b6