Merge "Add non-system user unlock time to timing trace"