Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev