Merge "Scale splash screen icon by 1.2 instead of 1.3" into sc-dev