Merge "Prevent crash in recent app list"