Bug 822913 - Switch back to record mode when unhidden if we were in record mode when hidden. r=daleharvey a=blocking+
Merge pull request #7359 from mozilla-b2g/camera-fix

Bug 822913 - Switch back to record mode when unhidden if we were in reco...
Bug 815886 - Use mozasyncpanzoom for "bookmark apps" created by browser r=@vingtetun
Merge pull request #7312 from ochameau/asyncpanzoom@815886

Bug 815886 - Consider using mozasyncpanzoom for "bookmark apps" created by browser r=@vingtetun
Auto-merge from branch 'master'