Merge "Fixed booting logic on ActivityTaskSupervisor.activityIdleInternal()" into sc-v2-dev