Merge "Fixing UserHandle for AppTarget Event from Launcher." into main