Merge "Fix RequestPinItemTest, broken by my manual merge." into ub-launcher3-master