Merge "Fixed spacing on Intro & Edu screens" into qt-dev
am: 806c65ca17

Change-Id: Iaa76703169d28f8ab6cfa1e8eee2b9c6efeadfb7