Merge "libtimeinstate: improve error handling in single-UID functions"