Merge "Camera: Handle case where BatteryInfo intent not available" into qt-dev