Merge "Test per-UID time_in_state files"