Merge "Add logs for controls restore" into main