Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
  PIP: Fix system UI crash

Change-Id: If073cb6c099d05abd99674b461bc46fbd377c9c2