Merge "Add padding to app clips sysui activity buttons" into main