Updates for calibration in BaseActivity & Sensor