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

Change-Id: Ibc0487db15cdd7b3a5648e11779af619a689f69d