Updated Firefox OS app to master

Change-Id: Ib07f86aa8f45e16d31b714c8d9a846c3731e0a17