Merge "Adding all-apps onboarding popup for 2-button mode"