resolve merge conflicts of 078d4de9 to ub-launcher3-calgary

<resources>

    <style name="LauncherTheme" parent="@style/BaseLauncherTheme">

        <item name="android:windowTranslucentStatus">false</item>

        <item name="android:windowTranslucentNavigation">false</item>

        <item name="android:windowDrawsSystemBarBackgrounds">true</item>

        <item name="android:statusBarColor">#00000000</item>

        <item name="android:navigationBarColor">#00000000</item>

        <item name="android:colorControlActivated">@color/launcher_accent_color</item>