Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
am: abe26c8d69

* commit 'abe26c8d69d7bfa5400e52ad4bb96020df0cdf68':
  PIP: Fix NPE when onboarding is shown

Change-Id: I3082c08a64f423b1fa9435a473b4f398e1350856