Merge "Fix for Bluetooth not restarting on User Switch"