Reverts: "Fix recent apps clear all" + some other fixes

Change-Id: I2fea2e6b118021d3f09c259aee92b1a35fe72302