[CB-2411] Added camera popover repositioning.

Also prevented the possibility of having multiple popovers from multiple
calls to Camera.getPicture.
merging popover change [CB-2411]