Merge "Move activity timeouts to ActivityRecord (81/n)"