Merge "Use a regular drawable as ConnectedDeviceDashboardActivity icon"

        <activity

            android:name=".Settings$ConnectedDeviceDashboardActivity"

            android:label="@string/connected_devices_dashboard_title"

            android:icon="@drawable/ic_homepage_connected_device"

            android:icon="@drawable/ic_devices_other"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.BLUETOOTH_SETTINGS" />