Updated Firefox OS app to master

Change-Id: Id46f21de91388e0b01bf65099890aa9a15bedf47