Prepare for pull.
Merge remote-tracking branch 'origin/master'
Enable camera to not disappear, after initial dismissal.