Merge "Fixing light border around sticky key indicator" into main