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

* commit '35cb0d48cef19b9afc5bcb6d96c4e1e00141b703':
  PIP: Fix system UI crash

Change-Id: I8a5a98ff317ff45469601817fad40618ae2e875d