Merge "Add Unit tests for System Shortcut." into main