Bug 833280 - [Camera] Wrong Camera flash sequence.

changes:
- separates flash types for picture and video
- fixes the inconsistency of 'auto' flash icon for 'torch' mode by showing 'on' flash icon instead.