Merge "Improve stability - return null when LastAccessedProvider no longer exist"