Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e
am: 7b1e4a02c3

* commit '7b1e4a02c3dddd79f7136bd264d519cf0fd29ba8':

Change-Id: I12d84f6cd95ab55771298678b89510ee95e75269