Merge "Handle CODE_EMERGENCY_TEMP_FAILURE and CODE_EMERGENCY_PERM_FAILURE" into main