Bug 1015248 - [Video] Update to use gaia-header
Bug 1015295 - [Keyboard] Update to use gaia-header

Conflicts:
	apps/keyboard/js/settings/settings.js