Merge "Fix the race between entitlement start/stop"