Merge "Move idle handling from ActivityStack to Supervisor"