Fix for errors shown on page refresh

removing finished tasks in anyway

Change-Id: I13036337a7183c7a87b13de1aecb0f6ff961c01f
Closes-bug: 1263126
Merge "Fix for errors shown on page refresh"