Merge "BAapp: Remove shared BT UID from BA App" into bt.lnx.5.0