diff -Nru unity-settings-daemon-15.04.1+15.10.20151021/debian/changelog unity-settings-daemon-15.04.1+15.10.20151029/debian/changelog
--- unity-settings-daemon-15.04.1+15.10.20151021/debian/changelog	2015-11-12 18:27:07.000000000 +0000
+++ unity-settings-daemon-15.04.1+15.10.20151029/debian/changelog	2015-11-12 18:27:08.000000000 +0000
@@ -1,3 +1,19 @@
+unity-settings-daemon (15.04.1+15.10.20151029-0ubuntu1) wily; urgency=medium
+
+  [ Lars Uebernickel ]
+  * power: disconnect signals from rr_screen (LP: #1508327)
+
+  [ Mitsuya Shibata ]
+  * unity-settings-daemon should initialize org.gnome.desktop.input-
+    sources for fcitx as same as ibus when sources property is empty.
+    (LP: #1465535)
+
+  [ Sebastien Bacher ]
+  * remove g_warning debug leftover
+  * xsettings: disconnect signal from plugin_settings
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 29 Oct 2015 10:19:55 +0000
+
 unity-settings-daemon (15.04.1+15.10.20151021-0ubuntu1) wily; urgency=medium
 
   [ Lars Uebernickel ]
diff -Nru unity-settings-daemon-15.04.1+15.10.20151021/gnome-settings-daemon/gsd-idle-monitor.c unity-settings-daemon-15.04.1+15.10.20151029/gnome-settings-daemon/gsd-idle-monitor.c
--- unity-settings-daemon-15.04.1+15.10.20151021/gnome-settings-daemon/gsd-idle-monitor.c	2015-10-21 11:04:54.000000000 +0000
+++ unity-settings-daemon-15.04.1+15.10.20151029/gnome-settings-daemon/gsd-idle-monitor.c	2015-10-29 10:19:47.000000000 +0000
@@ -950,11 +950,6 @@
         xsync->have_xsync = TRUE;
         XSyncSetPriority (xsync->display, None, 10);
       }
-
-    g_warning ("Attempted to init Xsync, found version %d.%d error base %d event base %d\n",
-                  major, minor,
-                  xsync->sync_error_base,
-                  xsync->sync_event_base);
 }
 
 void
diff -Nru unity-settings-daemon-15.04.1+15.10.20151021/plugins/keyboard/gsd-keyboard-manager.c unity-settings-daemon-15.04.1+15.10.20151029/plugins/keyboard/gsd-keyboard-manager.c
--- unity-settings-daemon-15.04.1+15.10.20151021/plugins/keyboard/gsd-keyboard-manager.c	2015-10-21 11:04:54.000000000 +0000
+++ unity-settings-daemon-15.04.1+15.10.20151029/plugins/keyboard/gsd-keyboard-manager.c	2015-10-29 10:19:51.000000000 +0000
@@ -510,7 +510,7 @@
                 { "bn_IN", "m17n:bn:inscript" },
                 { "gu_IN", "m17n:gu:inscript" },
                 { "hi_IN", "m17n:hi:inscript" },
-                { "ja_JP", "anthy" },
+                { "ja_JP", "mozc" },
                 { "kn_IN", "m17n:kn:kgp" },
                 { "ko_KR", "hangul" },
                 { "mai_IN", "m17n:mai:inscript" },
@@ -539,7 +539,7 @@
 }
 
 static void
-add_ibus_sources_from_locale (GSettings *settings)
+add_sources_from_locale (GsdKeyboardManager *manager, GSettings *settings)
 {
         const gchar *locale_engine;
         GVariantBuilder builder;
@@ -549,7 +549,16 @@
                 return;
 
         init_builder_with_sources (&builder, settings);
-        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
+#ifdef HAVE_IBUS
+        if (manager->priv->is_ibus_active) {
+                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
+        }
+#endif
+#ifdef HAVE_FCITX
+        if (manager->priv->is_fcitx_active) {
+                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_FCITX, locale_engine);
+        }
+#endif
         g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
 }
 
@@ -2134,8 +2143,8 @@
         sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
         if (g_variant_n_children (sources) < 1) {
                 get_sources_from_xkb_config (manager);
-#ifdef HAVE_IBUS
-                add_ibus_sources_from_locale (settings);
+#if defined(HAVE_IBUS) || defined(HAVE_FCITX)
+                add_sources_from_locale (manager, settings);
 #endif
         }
         g_variant_unref (sources);
diff -Nru unity-settings-daemon-15.04.1+15.10.20151021/plugins/power/gsd-power-manager.c unity-settings-daemon-15.04.1+15.10.20151029/plugins/power/gsd-power-manager.c
--- unity-settings-daemon-15.04.1+15.10.20151021/plugins/power/gsd-power-manager.c	2015-10-21 11:05:00.000000000 +0000
+++ unity-settings-daemon-15.04.1+15.10.20151029/plugins/power/gsd-power-manager.c	2015-10-29 10:19:39.000000000 +0000
@@ -3482,7 +3482,11 @@
         }
 
         g_clear_object (&manager->priv->logind_proxy);
-        g_clear_object (&manager->priv->rr_screen);
+
+        if (manager->priv->rr_screen) {
+                g_signal_handlers_disconnect_by_data (manager->priv->rr_screen, manager);
+                g_clear_object (&manager->priv->rr_screen);
+        }
 
         devices = manager->priv->devices_array;
         for (i = 0; i < devices->len; i++)
diff -Nru unity-settings-daemon-15.04.1+15.10.20151021/plugins/xsettings/gsd-xsettings-manager.c unity-settings-daemon-15.04.1+15.10.20151029/plugins/xsettings/gsd-xsettings-manager.c
--- unity-settings-daemon-15.04.1+15.10.20151021/plugins/xsettings/gsd-xsettings-manager.c	2015-10-21 11:04:54.000000000 +0000
+++ unity-settings-daemon-15.04.1+15.10.20151029/plugins/xsettings/gsd-xsettings-manager.c	2015-10-29 10:19:43.000000000 +0000
@@ -1144,6 +1144,7 @@
         }
 
         if (p->plugin_settings != NULL) {
+                g_signal_handlers_disconnect_by_data (p->plugin_settings, manager);
                 g_object_unref (p->plugin_settings);
                 p->plugin_settings = NULL;
         }