Fix bluetooth MAC when bluetooth is enabled on reboot
Remove compcache workaround

* Fixed upstream