Merge "Restore the use of the Desktop Limiter" into main