Merge branch 'master' into draw-icons-for-take-picture-activity
Draw buttons for take picture activity as PoC stubs
Merge branch 'draw-icons-for-take-picture-activity'