Merge pull request #10045 from daleharvey/853362

Bug 853362 - Move toggle flash / camera icons when filmstrip shown. r=djf(cherry picked from commit 6b75dbb7888acc7d094ae60c0302df7d49e056d7)

Conflicts:
	apps/camera/style/camera.css