Merge "Adding UI for sticky keys indicator" into main