Bug 827294 - [Settings] permission string IDs must not contain colon ':' r=etienne
Bug 827249 - Delete currentFrame when it is purged.
Bug 826589 - (Part 2) Use localized app name in activity picker. r=alive a=bb+
Bug 826394 - Don't show videos in gallery picker
Bug 825653 - Power save mode turns off by itself. r=Alive, a=bb+
Merge pull request #7329 from leibovic/activity-picker

Bug 826589 - (Part 2) Use localized app name in activity picker. r=alive a=bb+
Merge pull request #7323 from RudyLu/powersave/auto_switch_off

Bug 825653 - Power save mode turns off by itself. r=Alive, a=bb+ 
Merge pull request #7325 from lightsofapollo/calendar-weekview-crash

Bug 827249 - Delete currentFrame when it is purged.
Merge pull request #7328 from ttaubert/gallery/bug-826394-videos-in-gallery-picker

Bug 826394 - Don't show videos in gallery picker
Bug 827358 - When visibility change FB favorite contacts are duplicated and mis-rendered
Bug 826286 - time label should update should wait for moztimechange
Merge pull request #7334 from vingtetun/827294

Bug 827294 - [Settings] permission string IDs must not contain colon ':'...
Revert "Merge pull request #7311 from timdream/settings/sample-format"

This reverts commit 185a9cd5c446fee5bf05f38034a3607d9a7a4082, reversing
changes made to 194062b4e8b17a38247d5417094ab9743bd862b2.
Bug 824625 - Make "Sample Format" label localizable, r=evelyn, pike, a=blocking-basecamp
Bug 825985 - If we can't parse the settings, use the default ones.
Merge pull request #7332 from timdream/ftu/time-label2

Bug 826286 - time label should update should wait for moztimechange, r=kaze
Merge pull request #7333 from jmcanterafonseca/fix_localized_two_times

Bug 827358 - When visibility change FB favorite contacts are duplicated ...
Bug 822779 - [FTE] [Portuguese] Text Overlap in Tutorial screen
Bug 819947 - No WiFi networks detected during FTU experience. Add more debug. r=vingtetun
Merge pull request #7340 from vingtetun/819947

Bug 819947 - No WiFi networks detected during FTU experience. Add more d...