Fixes for onboarding view presentation.

Change-Id: I08ba1b99a19e59288ffe0e93fcd5016494956124