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