Camera cancel button works
Merge remote-tracking branch 'origin/master'
Camera cancel button works