Merge "Fix music output unable switch from BTHS to Phone"