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