diff -Nru unity8-8.14+16.10.20160826/CMakeLists.txt unity8-8.14+16.10.20160831.3/CMakeLists.txt
--- unity8-8.14+16.10.20160826/CMakeLists.txt	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/CMakeLists.txt	2016-08-31 14:55:46.000000000 +0300
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=20)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
diff -Nru unity8-8.14+16.10.20160826/debian/changelog unity8-8.14+16.10.20160831.3/debian/changelog
--- unity8-8.14+16.10.20160826/debian/changelog	2016-09-06 13:37:32.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/debian/changelog	2016-09-06 13:37:32.000000000 +0300
@@ -1,3 +1,10 @@
+unity8 (8.14+16.10.20160831.3-0ubuntu1) xenial; urgency=medium
+
+  [ Daniel d'Andrada ]
+  * Added implementation for MirSurfaceInterface::persistentId
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 31 Aug 2016 11:56:09 +0000
+
 unity8 (8.14+16.10.20160826-0ubuntu1) yakkety; urgency=medium
 
   * Make sure we emit sounds when taking a screenshot even after media-
diff -Nru unity8-8.14+16.10.20160826/debian/control unity8-8.14+16.10.20160831.3/debian/control
--- unity8-8.14+16.10.20160826/debian/control	2016-09-06 13:37:32.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/debian/control	2016-09-06 13:37:32.000000000 +0300
@@ -35,7 +35,7 @@
                libubuntugestures5-dev (>= 1.3.2030),
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
-               libunity-api-dev (>= 7.117),
+               libunity-api-dev (>= 7.118),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],
@@ -153,7 +153,7 @@
          qtdeclarative5-ubuntu-settings-components (>= 0.7),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-20,
+         unity-application-impl-21,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-12,
@@ -199,7 +199,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-20,
+          unity-application-impl-21,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell
diff -Nru unity8-8.14+16.10.20160826/po/br.po unity8-8.14+16.10.20160831.3/po/br.po
--- unity8-8.14+16.10.20160826/po/br.po	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/po/br.po	2016-08-31 14:55:33.000000000 +0300
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-08-19 14:16+0000\n"
-"PO-Revision-Date: 2016-04-27 12:20+0000\n"
+"PO-Revision-Date: 2016-08-29 11:37+0000\n"
 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-08-25 05:45+0000\n"
+"X-Launchpad-Export-Date: 2016-08-31 06:21+0000\n"
 "X-Generator: Launchpad (build 18179)\n"
 
 #: plugins/LightDM/Greeter.cpp:123
@@ -125,19 +125,19 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:41
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Berradennoù klavier"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:55
 msgid "Unity 8"
-msgstr ""
+msgstr "Unity 8"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:62
 msgid "PrtScr"
-msgstr ""
+msgstr "Moulsk"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:67
 msgid "Takes a screenshot."
-msgstr ""
+msgstr "Tapout ur skeudenn eus ar skramm"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:75
 msgid "Alt + PrtScr"
@@ -145,7 +145,7 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:80
 msgid "Takes a screenshot of a window."
-msgstr ""
+msgstr "Tapout ur skeudenn eus ur prenestr"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:88
 msgid "Super + Space"
@@ -165,7 +165,7 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:118
 msgid "Launcher"
-msgstr ""
+msgstr "Lañser"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:125
 msgid "Super (Hold)"
@@ -201,7 +201,7 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:181
 msgid "Scopes"
-msgstr ""
+msgstr "Kefluskerioù enklask"
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:188
 msgid "Super (Tap)"
@@ -209,7 +209,7 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:193
 msgid "Opens the Scopes home."
-msgstr ""
+msgstr "Digeriñ pajenn degemer ar c'hefluskerioù enklask."
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:209
 msgid "Switching"
@@ -249,7 +249,7 @@
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:271
 msgid "Minimizes all windows."
-msgstr ""
+msgstr "Bihanaat an holl brenestroù."
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:279
 msgid "Ctrl + Super + Up"
@@ -298,12 +298,12 @@
 #: qml/Components/MediaServices/VideoPlayerControls.qml:44
 #, qt-format
 msgid "%1:%2:%3"
-msgstr ""
+msgstr "%1:%2:%3"
 
 #: qml/Components/MediaServices/VideoPlayerControls.qml:49
 #, qt-format
 msgid "%1:%2"
-msgstr ""
+msgstr "%1:%2"
 
 #: qml/Components/ModeSwitchWarningDialog.qml:32
 msgid "Apps may have unsaved data:"
@@ -371,11 +371,11 @@
 
 #: qml/Dash/GenericScopeView.qml:585 qml/Dash/GenericScopeView.qml:780
 msgid "Show less"
-msgstr ""
+msgstr "Diskouez nebeutoc'h"
 
 #: qml/Dash/GenericScopeView.qml:585
 msgid "Show all"
-msgstr ""
+msgstr "Diskouez pep tra"
 
 #: qml/Dash/GenericScopeView.qml:642
 msgctxt "Label: Hint for dash search line edit"
@@ -447,7 +447,7 @@
 
 #: qml/Greeter/Greeter.qml:561
 msgid "Try again"
-msgstr ""
+msgstr "Esaeañ adarre"
 
 #: qml/Greeter/LoginList.qml:63
 msgid "Passphrase"
@@ -455,7 +455,7 @@
 
 #: qml/Greeter/LoginList.qml:64
 msgid "Passcode"
-msgstr ""
+msgstr "Kod-tremen"
 
 #: qml/Greeter/LoginList.qml:87
 msgid "Retry"
@@ -463,7 +463,7 @@
 
 #: qml/Greeter/LoginList.qml:88
 msgid "Log In"
-msgstr ""
+msgstr "Kevreañ"
 
 #: qml/Greeter/NarrowView.qml:55
 msgid "Sorry, incorrect passphrase."
@@ -656,15 +656,15 @@
 
 #: qml/Wizard/Pages/20-keyboard.qml:30
 msgid "Select Keyboard"
-msgstr ""
+msgstr "Diuzañ ar c'hlavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:70
 msgid "Keyboard language"
-msgstr ""
+msgstr "Yezh ar c'hlavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:92
 msgid "Keyboard layout"
-msgstr ""
+msgstr "Aozadur ar c'hlavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:151 qml/Wizard/Pages/30-wifi.qml:206
 #: qml/Wizard/Pages/60-account.qml:65
@@ -718,7 +718,7 @@
 
 #: qml/Wizard/Pages/40-location.qml:260
 msgid "You can change it later in System Settings."
-msgstr ""
+msgstr "Gallout a rit cheñch se diwezhatoc'h en arventennoù ar reizhiad."
 
 #: qml/Wizard/Pages/50-timezone.qml:29
 msgid "Time Zone"
@@ -773,7 +773,7 @@
 
 #: qml/Wizard/Pages/77-system-update.qml:28
 msgid "Update Device"
-msgstr ""
+msgstr "Hizivaat ar benveg"
 
 #: qml/Wizard/Pages/77-system-update.qml:55
 msgid ""
@@ -784,21 +784,21 @@
 #: qml/Wizard/Pages/77-system-update.qml:76
 msgctxt "string identifying name of the update"
 msgid "Ubuntu system"
-msgstr ""
+msgstr "Reizhiad Ubuntu"
 
 #: qml/Wizard/Pages/77-system-update.qml:83
 #, qt-format
 msgctxt "version of the system update"
 msgid "Version %1"
-msgstr ""
+msgstr "Stumm %1"
 
 #: qml/Wizard/Pages/77-system-update.qml:102
 msgid "This could take a few minutes..."
-msgstr ""
+msgstr "Gallout a ra padout un nebeud munutennoù..."
 
 #: qml/Wizard/Pages/77-system-update.qml:116
 msgid "Install and restart now"
-msgstr ""
+msgstr "Staliañ hag adloc'hañ bremañ"
 
 #: qml/Wizard/Pages/80-finished.qml:89
 msgid "Welcome to Ubuntu"
@@ -911,7 +911,7 @@
 
 #: qml/Wizard/Pages/sim.qml:55
 msgid "You must restart the device to access the mobile network."
-msgstr ""
+msgstr "Ret eo deoc'h adloc'hañ ar benveg evit mont d'ar rouedad hezoug."
 
 #: qml/Wizard/Pages/sim.qml:59
 msgid "Restart"
@@ -919,7 +919,7 @@
 
 #: qml/Wizard/Pages/sim.qml:78
 msgid "You won’t be able to make calls or use text messaging without a SIM."
-msgstr ""
+msgstr "Ne c'halloc'h ket pellgomz na kas kemennadennoù hep kartenn SIM."
 
 #: qml/Wizard/Pages/sim.qml:90
 msgid "To proceed with no SIM tap Skip."
@@ -927,7 +927,7 @@
 
 #: qml/Wizard/PasswordMeter.qml:87
 msgid "Password too short"
-msgstr ""
+msgstr "Re verr eo ar ger-tremen"
 
 #: qml/Wizard/PasswordMeter.qml:89
 msgid "Passwords match"
diff -Nru unity8-8.14+16.10.20160826/po/de.po unity8-8.14+16.10.20160831.3/po/de.po
--- unity8-8.14+16.10.20160826/po/de.po	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/po/de.po	2016-08-31 14:55:33.000000000 +0300
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-08-19 14:16+0000\n"
-"PO-Revision-Date: 2016-08-20 14:53+0000\n"
+"PO-Revision-Date: 2016-08-28 08:35+0000\n"
 "Last-Translator: Torsten Franz <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-08-25 05:45+0000\n"
+"X-Launchpad-Export-Date: 2016-08-29 06:38+0000\n"
 "X-Generator: Launchpad (build 18179)\n"
 
 #: plugins/LightDM/Greeter.cpp:123
@@ -662,15 +662,15 @@
 
 #: qml/Wizard/Pages/20-keyboard.qml:30
 msgid "Select Keyboard"
-msgstr ""
+msgstr "Tastatur wählen"
 
 #: qml/Wizard/Pages/20-keyboard.qml:70
 msgid "Keyboard language"
-msgstr ""
+msgstr "Tastatursprache"
 
 #: qml/Wizard/Pages/20-keyboard.qml:92
 msgid "Keyboard layout"
-msgstr ""
+msgstr "Tastaturlayout"
 
 #: qml/Wizard/Pages/20-keyboard.qml:151 qml/Wizard/Pages/30-wifi.qml:206
 #: qml/Wizard/Pages/60-account.qml:65
@@ -783,13 +783,15 @@
 
 #: qml/Wizard/Pages/77-system-update.qml:28
 msgid "Update Device"
-msgstr ""
+msgstr "Gerät aktualisieren"
 
 #: qml/Wizard/Pages/77-system-update.qml:55
 msgid ""
 "There is a system update available and ready to install. Afterwards, the "
 "device will automatically restart."
 msgstr ""
+"Es ist eine Systemaktualisierung verfügbar und bereit zur Installation. "
+"Danach wird das Gerät automatisch neu starten."
 
 #: qml/Wizard/Pages/77-system-update.qml:76
 msgctxt "string identifying name of the update"
@@ -804,11 +806,11 @@
 
 #: qml/Wizard/Pages/77-system-update.qml:102
 msgid "This could take a few minutes..."
-msgstr ""
+msgstr "Dies kann ein paar Minuten dauern …"
 
 #: qml/Wizard/Pages/77-system-update.qml:116
 msgid "Install and restart now"
-msgstr ""
+msgstr "Jetzt installieren und neu starten"
 
 #: qml/Wizard/Pages/80-finished.qml:89
 msgid "Welcome to Ubuntu"
diff -Nru unity8-8.14+16.10.20160826/po/fr.po unity8-8.14+16.10.20160831.3/po/fr.po
--- unity8-8.14+16.10.20160826/po/fr.po	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/po/fr.po	2016-08-31 14:55:33.000000000 +0300
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-08-19 14:16+0000\n"
-"PO-Revision-Date: 2016-08-14 10:36+0000\n"
-"Last-Translator: Anne <anneonyme017@gmail.com>\n"
+"PO-Revision-Date: 2016-08-30 15:06+0000\n"
+"Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-08-25 05:45+0000\n"
+"X-Launchpad-Export-Date: 2016-08-31 06:21+0000\n"
 "X-Generator: Launchpad (build 18179)\n"
 
 #: plugins/LightDM/Greeter.cpp:123
@@ -670,15 +670,15 @@
 
 #: qml/Wizard/Pages/20-keyboard.qml:30
 msgid "Select Keyboard"
-msgstr ""
+msgstr "Sélectionner le clavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:70
 msgid "Keyboard language"
-msgstr ""
+msgstr "Langue du clavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:92
 msgid "Keyboard layout"
-msgstr ""
+msgstr "Disposition du clavier"
 
 #: qml/Wizard/Pages/20-keyboard.qml:151 qml/Wizard/Pages/30-wifi.qml:206
 #: qml/Wizard/Pages/60-account.qml:65
@@ -791,32 +791,34 @@
 
 #: qml/Wizard/Pages/77-system-update.qml:28
 msgid "Update Device"
-msgstr ""
+msgstr "Mettre à jour l'appareil"
 
 #: qml/Wizard/Pages/77-system-update.qml:55
 msgid ""
 "There is a system update available and ready to install. Afterwards, the "
 "device will automatically restart."
 msgstr ""
+"Une mise à jour du système est disponible et prête à être installée. Votre "
+"appareil redémarrera automatiquement."
 
 #: qml/Wizard/Pages/77-system-update.qml:76
 msgctxt "string identifying name of the update"
 msgid "Ubuntu system"
-msgstr ""
+msgstr "Système Ubuntu"
 
 #: qml/Wizard/Pages/77-system-update.qml:83
 #, qt-format
 msgctxt "version of the system update"
 msgid "Version %1"
-msgstr ""
+msgstr "Version %1"
 
 #: qml/Wizard/Pages/77-system-update.qml:102
 msgid "This could take a few minutes..."
-msgstr ""
+msgstr "Cela pourra prendre quelques minutes…"
 
 #: qml/Wizard/Pages/77-system-update.qml:116
 msgid "Install and restart now"
-msgstr ""
+msgstr "Installer et redémarrer maintenant"
 
 #: qml/Wizard/Pages/80-finished.qml:89
 msgid "Welcome to Ubuntu"
diff -Nru unity8-8.14+16.10.20160826/po/unity8.pot unity8-8.14+16.10.20160831.3/po/unity8.pot
--- unity8-8.14+16.10.20160826/po/unity8.pot	2016-08-26 11:14:14.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/po/unity8.pot	2016-08-31 14:56:11.000000000 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 08:14+0000\n"
+"POT-Creation-Date: 2016-08-31 11:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru unity8-8.14+16.10.20160826/tests/mocks/Unity/Application/MirSurface.cpp unity8-8.14+16.10.20160831.3/tests/mocks/Unity/Application/MirSurface.cpp
--- unity8-8.14+16.10.20160826/tests/mocks/Unity/Application/MirSurface.cpp	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/tests/mocks/Unity/Application/MirSurface.cpp	2016-08-31 14:55:46.000000000 +0300
@@ -107,6 +107,11 @@
     return m_name;
 }
 
+QString MirSurface::persistentId() const
+{
+    return m_name+"Id";
+}
+
 Mir::Type MirSurface::type() const
 {
     return m_type;
diff -Nru unity8-8.14+16.10.20160826/tests/mocks/Unity/Application/MirSurface.h unity8-8.14+16.10.20160831.3/tests/mocks/Unity/Application/MirSurface.h
--- unity8-8.14+16.10.20160826/tests/mocks/Unity/Application/MirSurface.h	2016-08-26 11:13:44.000000000 +0300
+++ unity8-8.14+16.10.20160831.3/tests/mocks/Unity/Application/MirSurface.h	2016-08-31 14:55:46.000000000 +0300
@@ -74,6 +74,8 @@
 
     QString name() const override;
 
+    QString persistentId() const override;
+
     QSize size() const override { return QSize(width(),height()); }
     void resize(int width, int height) override;
     void resize(const QSize &size) override { resize(size.width(), size.height()); }