Merge "SF: Add details to setDesiredMode trace and log" into main