Merge "Connected data layer and UI layer for custom shortcuts retrieval" into main