Bug 828890 - [Settings] Scroll bar should not go over the header

Conflicts:
	apps/settings/index.html