Merge "Make APIs for custom shortcuts user handle aware" into main