Switching branch to commit
Got the image taken being displayed as the new background image
Merge branch 'master' into camera_layout
About to break some stuff
Pre Merge Commit
Post merge commit