Merge "Change the logic to check car idleness" into sc-dev