Merge "Fix NPE in Recent Apps"