Merge Firefox OS - CAF Patches

Somehow didnt get merged