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

* commit 'a7932ad29048f3b430a01a14c310e1718c35114c':
  PIP: Fix system UI crash

Change-Id: I3b862c6f01bf05407cf4655a1bd48e732df52084