Merge "Change bluetooth routing to be more responsive"