Merge "Avoid Bluetooth gets turned on by enableBle" into sc-qpr1-dev