Merge "Update CarWindowService"