Merge "Rework smc_unknown return code path in smc_handler" into integration