Merge "Fix border color of Compose security footer actions" into main