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