Merge "Avoid deadlock between mUsers and cacheLock" into klp-dev