Bug 826589 - (Part 2) Use localized app name in activity picker. r=alive a=bb+
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+