Merge "Fix smart reply lifetime extension" into sc-v2-dev