Merge "Fix retrieval of instant app cookies from cache"