Merge "Fix regression in recent task list replacement" into pi-dev am: 330f2fb05d
am: 87c1f0e510

Change-Id: I96e541b365d408d10bc105cc8fa01abea2a0b0bf