Merge "Fixed spacing on Intro & Edu screens" into qt-dev