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

Change-Id: I7daf5682d9175575e02304925c3f49b57516c7d2