Merge "Application Onboarding page changes "