Merge "Adjust padding on SIM onboarding screens" into main