Merge "Use elapsed-time in AppTimeLimitController." into sc-dev