Merge "Prevent Null Pointer Exception caused by race condition in AVRCP init"