MOSYNC-2970. Changes after code review.
MOSYNC-2970. Changes made to camera demo after code review.