Bug 1061437 - Revert the patches of embedding BT app in settings app