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

* commit '552c5af941ad45fb9132807e3e3e341b05c44eaa':

Change-Id: Ie5bd40a5217495ec549211709baf60ed885b3fa1