Merge "Camera: Add support for IMapper 3.0" into qt-dev
am: 057de3759f

Change-Id: I144e165d04b55d98944ad4fb5db52444ab713ea3