Merge "Force esp loopback for hidden menu testing" into main