Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev am: 20ebb32825
am: 59af233fe8

Change-Id: Ie660665105d34ec7f2c1fef839174bb5945ba0ff