MOSYNC-2946. Changes made to camera widgetafter code review.