Merge "Fix Square Recent button unresponsiveness" into main