Merge "If zen settings are updated, don't show onboarding" into pi-dev
am: aaac61eb5e

Change-Id: I96929a31ab8f644f83db74ce12b201bd0852c782