Tv demo rebase latest

Rebase to latest master: https://github.com/mozilla-b2g/gaia/commit/b630b8bcaf9653885539d4449bc65c3b592bd752