Merge "Cache quickPickupEnabled state" into tm-dev