Camera2: Fix burst mode, auto scene detect layout

* Prevent icons from stacking ontop of each other

Change-Id: I4a1c8ae360c7272bfa2833aaf64410a2778a7ff7