Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev