Merge "Log length of grace period used to start Activity" into main