Merge "Implemented custom focus states for shortcut helper categories" into main