Merge "Prevent Recents from lingering after screen-off."