[MERGE] Revert a fix that is not needed anymore for calibration screen lockup