Fix for onboarding globe flicker.

Also fix for restricting onboarding screen to portrait for phones.

Change-Id: I6cafaddd5f83130269393b3ac1050f122acc3b9f