Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev