Merge "Update last active timestamp when resumption added" into main