Merge "Move sleep from ActivityStack to Supervisor"