Merge "SnapdragonCamera: Fix can`t swap from icon for camera" into camera.lnx.1.0-dev.1.0