Merge "Fix shade external keyboard user activity handling" into main