Bug 827249 - Delete currentFrame when it is purged.
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 #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
Auto-merge from branch 'master'