Bug 824615 - Multiple activities
Bug 825798 - Automatically shutdown when battery is too low, r=timdream,
    a=blocking-basecamp
Merge pull request #7277 from alivedise/bugzilla/825798/automatic-shutdown-low-battery

Bug 825798 - Automatically shutdown when battery is too low
Merge pull request #7276 from alivedise/bugzilla/824615/multiple-activity

Bug 824615 - Multiple activities
Auto-merge from branch 'master'