Merge "Using more comprehensive flags for sticky keys feature" into main