Merge "Guard update timestamp logic with lock." into main