Merge "Shortcut Helper - Retrieve app categories shortcuts from WindowManager" into main