Merge "Camera: fix null pointer dereference" into qt-dev
am: dc7de27113

Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8