Merge pull request #12683 from mcirlanaru/bug_911001

Bug 911001 - Don't reset power save mode when battery almost empty. r=@alivedise(cherry picked from commit 952234afce7b50b908f75b2f3830168a6b9b941b)
Merge pull request #12543 from huchengtw-moz/camera/Bug_921821_picture_size_larger_when_rotating

Bug 921821 - [Buri][Camera]The picture size larger than normally size wh...r=djf(cherry picked from commit 68dd4121263af5c90aaefc400a64b862e4eeb8d6)