Fixing welcome screen sizing for iPhone
Fixed merging changes