Merge "Add aconfig flag for mouse swap primary button" into main