shell: Update to MetaCursorTracker API change

The pointer coordinates in meta_cursor_tracker_get_pointer() are now returned as a graphene_point_t.
st/test-theme: Use stage from mutter
2020-08-13 19:49:11 +00:00 · 2020-08-13 12:46:22 +00:00 · 2020-08-13 10:41:32 +02:00 · 2020-08-13 10:33:26 +02:00 · 2020-08-13 09:26:56 +02:00 · 2020-08-13 01:40:06 +02:00
163 changed files with 15904 additions and 12720 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -9,7 +9,6 @@ stages:
 variables:
    BUNDLE: "extensions-git.flatpak"
    JS_LOG: "js-report.txt"
-    POT_LOG: "pot-update.txt"

 .only_default: &only_default
    only:
@ -67,6 +66,7 @@ no_template_check:
 build:
    image: registry.gitlab.gnome.org/gnome/mutter/master:v4
    stage: build
+    needs: []
    before_script:
        - .gitlab-ci/checkout-mutter.sh
        - meson mutter mutter/build --prefix=/usr -Dtests=false
@ -85,6 +85,7 @@ build:
 test:
    image: registry.gitlab.gnome.org/gnome/mutter/master:v4
    stage: test
+    needs: ["build"]
    variables:
        XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
        NO_AT_BRIDGE: "1"
@ -99,24 +100,9 @@ test:
            - build/meson-logs/testlog.txt
        when: on_failure

-test-pot:
-    image: registry.gitlab.gnome.org/gnome/mutter/master:v4
-    stage: test
-    before_script:
-        - ninja -C mutter/build install
-    script:
-        # Check that pot files are generated correctly:
-        # https://savannah.gnu.org/bugs/?50920#comment5
-        - ninja -C build gnome-shell-pot 2>&1 | awk '
-            BEGIN { start=0; }
-            start==1 { print $0; }
-            /gnome-shell-pot/ { start=1; }
-          ' | tee $POT_LOG
-        - (! grep -q . $POT_LOG)
-    <<: *only_default
-
 flatpak:
    stage: build
+    needs: []
    variables:
        SUBPROJECT: "subprojects/extensions-app"
        # Your manifest path
--- a/67
+++ b/67
@ -1,3 +1,70 @@
+3.37.90
+=======
+* Fix extension updates when many extensions are installed [Jeremias; !1363]
+* Fix missing icons in on-screen keyboard [Emre; #2631, #3007]
+* Fix delay when showing calendar events [Sebastian; #2992]
+* Allow rearranging items in app picker [Georges; !1284]
+* Fix top bar navigation when NumLock is active [Olivier; #550]
+* Delay login animation until wallpaper has loaded [Michael; #734996]
+* Reset auth prompt on login screen on VT switch before fade in [Ray; #2997]
+* Move screencasting into a separate service [Jonas Å.; !1372]
+* Replace loaded terms with more descriptive one [Olivier; !1393]
+* Add "Boot Options" support to restart dialog [Hans; !199]
+* Move "Restart" into a separate menu item/dialog [Florian; #2202]
+* Default to not installing updates on low battery [Michael; #2717]
+* Misc. bug fixes and cleanups [Florian, Daniel V., Georges, Jonas Å.,
+  Daniel G., Carlos, Benjamin, Piotr, Andre, Jonas D., Andy; !1357, !1356,
+  #2969, #2969, !1358, !1371, #3005, !1380, #3022, !1381, !895, !1387, !1386,
+  !1385, #3037, !1389, !1390, !1391, !1383, !1399, #2983, !1403]
+
+Contributors:
+  Jonas Ådahl, Benjamin Berg, Michael Catanzaro, Piotr Drąg, Jonas Dreßler,
+  Olivier Fourdan, Carlos Garnacho, Hans de Goede, Andy Holmes,
+  Sebastian Keller, Andre Moreira Magalhaes, Daniel García Moreno,
+  Florian Müllner, Georges Basile Stavracas Neto, Jeremias Ortega, Ray Strode,
+  Emre Uyguroglu, Daniel van Vugt
+
+Translators:
+  Tim Sabsch [de], Boyuan Yang [zh_CN], Fabio Tomat [fur],
+  Efstathios Iosifidis [el], Rafael Fontenelle [pt_BR], Yuri Chornoivan [uk],
+  Daniel Șerbănescu [ro], Jordi Mas [ca], Daniel Mustieles [es],
+  Emin Tufan Çetin [tr], Asier Sarasua Garmendia [eu]
+
+3.37.3
+======
+* Refactor and clean up window picker
+  [Jonas D., Florian; !1297, !1298, !1305, !1345, !1353]
+* Move calendar events out of notifications list [Florian; !1282]
+* Refine app folder dialogs [Georges; !1301]
+* Hide switch-user button on lock screen if unsupported [Chingkai; #2687]
+* Refactor and clean up app picker pagination [Georges; !1271]
+* Add API to retrieve specified mimetypes from clipboards [Carlos; !1321]
+* Support prepending workspace with horizontal layouts [Florian; #2916]
+* Update microphone icon on input volume changes [fludixx; #2902]
+* Cache labels on GPU [Daniel; !1329]
+* Fix regressions in redesigned modal dialogs [Florian, Jonas D.; #2491, !1336]
+* Use GIcon for all application icons [Florian; !1342]
+* Support pre-authenticated logins in vmware environments [yun341; #1983]
+* Better support sandboxed apps with multiple .desktop files [Florian; #219]
+* Fix on-screen keyboard size in portrait orientation [Florian; #2349]
+* Plugged leaks [Sebastian, Daniel, Florian; !1306, !1319, !1341]
+* Misc. bug fixes and cleanups [Jonas D., Georges, Marco, Florian, Sebastian,
+  MOZGIII, Daniel, Mariana, Jonas Å.; !1296, !1295, #2643, !1300, !1309,
+  !1119, #2901, !1313, !1251, !1285, !1307, !1318, !1310, !1320, !1327, !1315,
+  !1289, !1331, !1332, !1333, !1334, !1340, !1287, !1308, !1346, !1299, !1343,
+  !1351, !1352, !1322]
+
+Contributors:
+  Marco Trevisan (Treviño), Chingkai, Jonas Dreßler, Carlos Garnacho,
+  Sebastian Keller, MOZGIII, Florian Müllner, Georges Basile Stavracas Neto,
+  Mariana Picolo, Daniel van Vugt, fludixx, yun341, Jonas Ådahl
+
+Translators:
+  Daniel Mustieles [es], Boyuan Yang [zh_CN], Yuri Chornoivan [uk],
+  Jordi Mas [ca], sicklylife [ja], Emin Tufan Çetin [tr],
+  Baurzhan Muftakhidinov [kk], Florentina Mușat [ro], Aurimas Černius [lt],
+  Rūdolfs Mazurs [lv]
+
 3.37.2
 ======
 * Add support for "PrefersNonDefaultGPU" desktop key [Bastien; !1226]
--- a/data/dbus-interfaces/org.freedesktop.login1.Manager.xml
+++ b/data/dbus-interfaces/org.freedesktop.login1.Manager.xml
@ -20,6 +20,12 @@
    <method name="ListSessions">
      <arg name="sessions" type="a(susso)" direction="out"/>
    </method>
+    <method name="CanRebootToBootLoaderMenu">
+      <arg type="s" direction="out"/>
+    </method>
+    <method name="SetRebootToBootLoaderMenu">
+      <arg type="t" direction="in"/>
+    </method>
    <signal name="PrepareForSleep">
      <arg type="b" direction="out"/>
    </signal>
--- a/data/dbus-interfaces/org.gnome.Mutter.ScreenCast.xml
+++ b/data/dbus-interfaces/org.gnome.Mutter.ScreenCast.xml
@ -0,0 +1,191 @@
+<!DOCTYPE node PUBLIC
+'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
+'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+<node>
+
+  <!--
+      org.gnome.Mutter.ScreenCast:
+      @short_description: Screen cast interface
+
+      This API is private and not intended to be used outside of the integrated
+      system that uses libmutter. No compatibility between versions are
+      promised.
+  -->
+  <interface name="org.gnome.Mutter.ScreenCast">
+
+    <!--
+	CreateSession:
+	@properties: Properties
+	@session_path: Path to the new session object
+
+	* "remote-desktop-session-id" (s): The ID of a remote desktop session.
+					   Remote desktop driven screen casts
+					   are started and stopped by the remote
+					   desktop session.
+	* "disable-animations" (b): Set to "true" if the screen cast application
+				    would prefer animations to be globally
+				    disabled, while the session is running. Default
+				    is "false". Available since version 3.
+    -->
+    <method name="CreateSession">
+      <arg name="properties" type="a{sv}" direction="in" />
+      <arg name="session_path" type="o" direction="out" />
+    </method>
+
+    <!--
+        Version:
+        @short_description: API version
+    -->
+    <property name="Version" type="i" access="read" />
+
+  </interface>
+
+  <!--
+       org.gnome.Mutter.ScreenCast.Session:
+       @short_description: Screen cast session
+  -->
+  <interface name="org.gnome.Mutter.ScreenCast.Session">
+
+    <!--
+	Start:
+
+	Start the screen cast session
+    -->
+    <method name="Start" />
+
+    <!--
+	Stop:
+
+	Stop the screen cast session
+    -->
+    <method name="Stop" />
+
+    <!--
+	Closed:
+
+	The session has closed.
+    -->
+    <signal name="Closed" />
+
+    <!--
+	RecordMonitor:
+	@connector: Connector of the monitor to record
+	@properties: Properties
+	@stream_path: Path to the new stream object
+
+	Record a single monitor.
+
+	Available @properties include:
+
+	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see below)
+	                     Available since API version 2.
+	* "is-recording" (b): Whether this is a screen recording. May be
+			      be used for choosing panel icon.
+			      Default: false. Available since API version 4.
+
+	Available cursor mode values:
+
+	0: hidden - cursor is not included in the stream
+	1: embedded - cursor is included in the framebuffer
+	2: metadata - cursor is included as metadata in the PipeWire stream
+    -->
+    <method name="RecordMonitor">
+      <arg name="connector" type="s" direction="in" />
+      <arg name="properties" type="a{sv}" direction="in" />
+      <arg name="stream_path" type="o" direction="out" />
+    </method>
+
+    <!--
+	RecordWindow:
+	@properties: Properties used determining what window to select
+	@stream_path: Path to the new stream object
+
+	Supported since API version 2.
+
+	Record a single window. The cursor will not be included.
+
+	Available @properties include:
+
+	* "window-id" (t): Id of the window to record.
+	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see RecordMonitor).
+	* "is-recording" (b): Whether this is a screen recording. May be
+			      be used for choosing panel icon.
+			      Default: false. Available since API version 4.
+
+    -->
+    <method name="RecordWindow">
+      <arg name="properties" type="a{sv}" direction="in" />
+      <arg name="stream_path" type="o" direction="out" />
+    </method>
+
+    <!--
+	RecordArea:
+	@x: X position of the recorded area
+	@y: Y position of the recorded area
+	@width: width of the recorded area
+	@height: height of the recorded area
+	@properties: Properties
+	@stream_path: Path to the new stream object
+
+	Record an area of the stage. The coordinates are in stage coordinates.
+	The size of the stream does not necessarily match the size of the
+	recorded area, and will depend on DPI scale of the affected monitors.
+
+	Available @properties include:
+
+	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see below)
+	                     Available since API version 2.
+	* "is-recording" (b): Whether this is a screen recording. May be
+			      be used for choosing panel icon.
+			      Default: false. Available since API version 4.
+
+	Available cursor mode values:
+
+	0: hidden - cursor is not included in the stream
+	1: embedded - cursor is included in the framebuffer
+	2: metadata - cursor is included as metadata in the PipeWire stream
+    -->
+    <method name="RecordArea">
+      <arg name="x" type="i" direction="in" />
+      <arg name="y" type="i" direction="in" />
+      <arg name="width" type="i" direction="in" />
+      <arg name="height" type="i" direction="in" />
+      <arg name="properties" type="a{sv}" direction="in" />
+      <arg name="stream_path" type="o" direction="out" />
+    </method>
+  </interface>
+
+  <!--
+       org.gnome.Mutter.ScreenCast.Stream:
+       @short_description: Screen cast stream
+  -->
+  <interface name="org.gnome.Mutter.ScreenCast.Stream">
+
+    <!--
+	PipeWireStreamAdded:
+	@short_description: Pipewire stream added
+
+	A signal emitted when PipeWire stream for the screen cast stream has
+	been created. The @node_id corresponds to the PipeWire stream node.
+    -->
+    <signal name="PipeWireStreamAdded">
+      <annotation name="org.gtk.GDBus.C.Name" value="pipewire-stream-added"/>
+      <arg name="node_id" type="u" direction="out" />
+    </signal>
+
+    <!--
+	Parameters:
+	@short_description: Optional stream parameters
+
+	Available parameters include:
+
+	* "position" (ii): Position of the source of the stream in the
+	                   compositor coordinate space.
+	* "size" (ii): Size of the source of the stream in the compositor
+		       coordinate space.
+    -->
+    <property name="Parameters" type="a{sv}" access="read" />
+
+  </interface>
+
+</node>
--- a/data/dbus-interfaces/org.gnome.Shell.Introspect.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Introspect.xml
@ -70,6 +70,14 @@
    -->
    <property name="AnimationsEnabled" type="b" access="read"/>

+    <!--
+       ScreenSize:
+       @short_description: The size of the screen
+
+       Since: 3
+    -->
+    <property name="ScreenSize" type="(ii)" access="read"/>
+
    <property name="version" type="u" access="read"/>
  </interface>
 </node>
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@ -28,6 +28,7 @@
    <file preprocess="xml-stripblanks">org.freedesktop.UPower.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Magnifier.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Magnifier.ZoomRegion.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Mutter.ScreenCast.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.ScreenSaver.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.SessionManager.EndSessionDialog.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.SessionManager.Inhibitor.xml</file>
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@ -6,25 +6,25 @@
    <file>checkbox-off-focused.svg</file>
    <file>checkbox-off.svg</file>
    <file>checkbox.svg</file>
-    <file alias="icons/color-pick.svg">color-pick.svg</file>
+    <file alias="icons/scalable/actions/color-pick.svg">color-pick.svg</file>
    <file>dash-placeholder.svg</file>
    <file>gnome-shell.css</file>
    <file>gnome-shell-high-contrast.css</file>
-    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
+    <file alias="icons/scalable/status/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
    <file>no-events.svg</file>
    <file>no-notifications.svg</file>
    <file>pad-osd.css</file>
-    <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
-    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
-    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
-    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
-    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
-    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
-    <file alias="icons/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
-    <file alias="icons/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
-    <file alias="icons/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
-    <file alias="icons/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
-    <file alias="icons/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
+    <file alias="icons/scalable/status/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
+    <file alias="icons/scalable/status/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
+    <file alias="icons/scalable/actions/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+    <file alias="icons/scalable/actions/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+    <file alias="icons/scalable/actions/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
+    <file alias="icons/scalable/actions/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
+    <file alias="icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
+    <file alias="icons/scalable/status/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
+    <file alias="icons/scalable/status/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
+    <file alias="icons/scalable/status/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
+    <file alias="icons/scalable/status/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
    <file>process-working.svg</file>
    <file>toggle-off.svg</file>
    <file>toggle-off-dark.svg</file>
--- a/data/gnome-shell-x11.target
+++ b/data/gnome-shell-x11.target
@ -1,10 +0,0 @@
-[Unit]
-Description=GNOME Shell on X11
-DefaultDependencies=no
-
-Requisite=gnome-session-initialized.target
-PartOf=gnome-session-initialized.target
-Before=gnome-session-initialized.target
-
-Requires=gnome-shell-x11.service
-After=gnome-shell-x11.service
--- a/data/meson.build
+++ b/data/meson.build
@ -101,22 +101,21 @@ if have_systemd
  unitconf.set('bindir', bindir)

  configure_file(
-    input: 'gnome-shell-x11.service.in',
-    output: 'gnome-shell-x11.service',
+    input: 'org.gnome.Shell@x11.service.in',
+    output: 'org.gnome.Shell@x11.service',
    configuration: unitconf,
    install_dir: systemduserunitdir
  )

  configure_file(
-    input: 'gnome-shell-wayland.service.in',
-    output: 'gnome-shell-wayland.service',
+    input: 'org.gnome.Shell@wayland.service.in',
+    output: 'org.gnome.Shell@wayland.service',
    configuration: unitconf,
    install_dir: systemduserunitdir
  )

-  units = files('gnome-shell-x11.target',
-                'gnome-shell-wayland.target',
-                'gnome-shell-disable-extensions.service')
+  units = files('org.gnome.Shell.target',
+                'org.gnome.Shell-disable-extensions.service')

  install_data(units, install_dir: systemduserunitdir)
 endif
--- a/data/org.gnome.Shell-disable-extensions.service
+++ b/data/org.gnome.Shell-disable-extensions.service
--- a/data/gnome-shell-wayland.target
+++ b/data/gnome-shell-wayland.target
@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target

-Requires=gnome-shell-wayland.service
-After=gnome-shell-wayland.service
+Wants=org.gnome.Shell@wayland.service
+Wants=org.gnome.Shell@x11.service
--- a/data/org.gnome.Shell@wayland.service.in
+++ b/data/org.gnome.Shell@wayland.service.in
@ -1,7 +1,7 @@
 [Unit]
 Description=GNOME Shell on Wayland
 # On wayland, force a session shutdown
-OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-shutdown.target
 OnFailureJobMode=replace-irreversibly
 CollectMode=inactive-or-failed
 RefuseManualStart=on
@ -13,18 +13,21 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target

-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-x11.service
-
 [Service]
+Slice=session.slice
 Type=notify
+# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
+#       with systemd >= 245. Also, the current solution is kind of painful
+#       as systemd had a bug where it retries the condition.
+# Only start if the template instance matches the session type.
+ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1

 # unset some environment variables that were set by the shell and won't work now that the shell is gone
 ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY

-# Exit code 1 means we are probably *not* dealing with an extension failure
-SuccessExitStatus=1
 # On wayland we cannot restart
 Restart=no
 # Kill any stubborn child processes after this long
--- a/data/org.gnome.Shell@x11.service.in
+++ b/data/org.gnome.Shell@x11.service.in
@ -1,7 +1,7 @@
 [Unit]
 Description=GNOME Shell on X11
 # On X11, try to show the GNOME Session Failed screen
-OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-failed.target
 OnFailureJobMode=replace
 CollectMode=inactive-or-failed
 RefuseManualStart=on
@ -13,18 +13,24 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target

-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-wayland.service
-
 # Limit startup frequency more than the default
 StartLimitIntervalSec=15s
 StartLimitBurst=3

 [Service]
+Slice=session.slice
 Type=notify
+# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
+#       with systemd >= 245. Also, the current solution is kind of painful
+#       as systemd had a bug where it retries the condition.
+# Only start if the template instance matches the session type.
+ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell
 # Exit code 1 means we are probably *not* dealing with an extension failure
 SuccessExitStatus=1
+
+# On X11 we do not need to unset any variables
+
 # On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
 Restart=always
 # Do not wait before restarting the shell
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@ -109,6 +109,17 @@
        the shell.
      </description>
    </key>
+    <key name="app-picker-layout" type="aa{sv}">
+      <default>[]</default>
+      <summary>Layout of the app picker</summary>
+      <description>
+        Layout of the app picker. Each entry in the array is a page. Pages are
+        stored in the order they appear in GNOME Shell. Each page contains an
+        “application id” → 'data' pair. Currently, the following values are
+        stored as 'data':
+          • “position”: the position of the application icon in the page
+      </description>
+    </key>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
  </schema>

--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@ -1,17 +1,13 @@
 /* App Grid */

 $app_icon_size: 96px;
-$app_icon_padding: 24px;

 // app icons
 .icon-grid {
-  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
-  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
-  spacing: $base_spacing * 6;
-
-  .overview-icon {
-    icon-size: $app_icon_size;
-  }
+  row-spacing: $base_spacing * 6;
+  column-spacing: $base_spacing * 6;
+  max-row-spacing: $base_spacing * 12;
+  max-column-spacing: $base_spacing * 12;
 }

 /* App Icons */
@ -42,8 +38,8 @@ $app_grid_fg_color: #fff;
 .app-folder-dialog {
  border-radius: $modal_radius * 1.5;
  border: 1px solid $osd_outer_borders_color;
-  spacing: 12px;
  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
+  padding: 12px;

  & .folder-name-container {
    padding: 24px 36px 0;
@ -52,7 +48,7 @@ $app_grid_fg_color: #fff;
    & .folder-name-label,
    & .folder-name-entry {
      font-size: 18pt;
-      font-weight: bold;
+      font-weight: 800;
    }

    & .folder-name-entry { width: 300px }
@ -71,11 +67,24 @@ $app_grid_fg_color: #fff;
      & > StIcon { icon-size: 16px }
    }
  }
+
+  & .icon-grid {
+    row-spacing: $base_spacing * 2;
+    column-spacing: $base_spacing * 5;
+  }
+
+  & .page-indicators {
+    margin-bottom: 18px;
+
+    .page-indicator {
+      padding: 15px 12px;
+    }
+  }
 }
 .app-folder-dialog-container {
  padding: 12px;
-  width: 800px;
-  height: 600px;
+  width: 620px;
+  height: 620px;
 }

 .app-folder-icon {
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@ -177,6 +177,32 @@
  }
 }

+/* Events */
+.events-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .events-box {
+    spacing: $base_spacing;
+  }
+
+  .events-list {
+    spacing: 2 * $base_spacing;
+  }
+
+  .events-title {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+    margin-bottom: $base_margin;
+  }
+
+  .event-time {
+    color: darken($fg_color,20%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 1);
+  }
+}
+
 /* World clocks */
 .world-clocks-button {
  @include notification_bubble;
@ -206,7 +232,9 @@
    color: $fg_color;
    font-feature-settings: "tnum";
    @include fontsize($base_font_size);
-    text-align: right;
+
+    &:ltr { text-align: right; }
+    &:rtl { text-align: left; }
  }

  // timezone offset label
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@ -138,11 +138,10 @@
 .user-widget.horizontal .user-widget-label {
  @include fontsize($base_font_size + 2);
  font-weight: bold;
-  text-align: left;
  padding-left: 15px;

-  &:ltr { padding-left: 14px; }
-  &:rtl { padding-right: 14px; }
+  &:ltr { padding-left: 14px; text-align: left; }
+  &:rtl { padding-right: 14px; text-align: right; }
 }

 .user-widget.vertical .user-widget-label {
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@ -71,9 +71,11 @@
    > .event-time {
      color: transparentize($fg_color, 0.5);
      @include fontsize($base_font_size - 2);
-      text-align: right;
      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
      padding-bottom: 0.13em;
+
+      &:ltr { text-align: right };
+      &:rtl { text-align: left };
    }
  }

--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@ -76,8 +76,10 @@ $popover_arrow_height: 12px;

 // container for radio and check boxes
 .popup-menu-ornament {
-  text-align: right;
  width: 1.2em;
+
+  &:ltr { text-align: right };
+  &:rtl { text-align: left };
 }

 // separator
--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@ -1,19 +1,20 @@
 /* Window Picker */

-$window_picker_spacing: $base_spacing * 2; // 16px
-$window_picker_padding: $base_padding * 2; // 16px
+$window_picker_spacing: $base_spacing; // 6px
+$window_picker_padding: $base_padding * 2; // 12px

 $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);

 $window_close_button_size: 24px;
 $window_close_button_padding: 3px;

+$window_clone_border_size: 6px;

 // Window picker
 .window-picker {
  // Space between window thumbnails
-  -horizontal-spacing: $window_picker_spacing;
-  -vertical-spacing: $window_picker_spacing;
+  spacing: $window_picker_spacing;
+
  // Padding for container around window thumbnails
  padding: $window_picker_padding;

@ -22,7 +23,7 @@ $window_close_button_padding: 3px;

 // Borders on window thumbnails
 .window-clone-border {
-  border-width: 6px;
+  border-width: $window_clone_border_size;
  border-style: solid;
  border-color: $window_thumbnail_border_color;
  border-radius: $base_border_radius + 2;
@ -54,8 +55,6 @@ $window_close_button_padding: 3px;
  width: $window_close_button_size;
  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);

-  -shell-close-overlap: $window_close_button_size * 0.5;
-
  &:hover {
    background-color: lighten($selected_bg_color, 5%);
  }
--- a/docs/reference/shell/meson.build
+++ b/docs/reference/shell/meson.build
@ -3,13 +3,8 @@ private_headers = [
  'gactionobservable.h',
  'gactionobserver.h',
  'shell-network-agent.h',
-  'shell-recorder-src.h'
 ]

-if not enable_recorder
-  private_headers += 'shell-recorder.h'
-endif
-
 exclude_directories = [
  'calendar-server',
  'hotplug-sniffer',
--- a/js/dbusServices/dbusService.js
+++ b/js/dbusServices/dbusService.js
@ -25,6 +25,8 @@ var ServiceImplementation = class {

        // subclasses may override this to disable automatic shutdown
        this._autoShutdown = true;
+
+        this._queueShutdownCheck();
    }

    // subclasses may override this to own additional names
--- a/js/dbusServices/meson.build
+++ b/js/dbusServices/meson.build
@ -8,6 +8,12 @@ dbus_services = {
  'org.gnome.Shell.Notifications': 'notifications',
 }

+if enable_recorder
+  dbus_services += {
+    'org.gnome.Shell.Screencast': 'screencast',
+  }
+endif
+
 config_dir = '@0@/..'.format(meson.current_build_dir())

 foreach service, dir : dbus_services
--- a/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shell/Screencast/js">
+    <file>main.js</file>
+    <file>screencastService.js</file>
+    <file>dbusService.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/fileUtils.js</file>
+  </gresource>
+</gresources>
--- a/js/dbusServices/screencast/main.js
+++ b/js/dbusServices/screencast/main.js
@ -0,0 +1,11 @@
+/* exported main */
+
+const { DBusService } = imports.dbusService;
+const { ScreencastService } = imports.screencastService;
+
+function main() {
+    const service = new DBusService(
+        'org.gnome.Shell.Screencast',
+        new ScreencastService());
+    service.run();
+}
--- a/js/dbusServices/screencast/screencastService.js
+++ b/js/dbusServices/screencast/screencastService.js
@ -0,0 +1,458 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported ScreencastService */
+
+const { Gio, GLib, Gst } = imports.gi;
+
+const { loadInterfaceXML, loadSubInterfaceXML } = imports.misc.fileUtils;
+const { ServiceImplementation } = imports.dbusService;
+
+const ScreencastIface = loadInterfaceXML('org.gnome.Shell.Screencast');
+
+const IntrospectIface = loadInterfaceXML('org.gnome.Shell.Introspect');
+const IntrospectProxy = Gio.DBusProxy.makeProxyWrapper(IntrospectIface);
+
+const ScreenCastIface = loadSubInterfaceXML(
+    'org.gnome.Mutter.ScreenCast', 'org.gnome.Mutter.ScreenCast');
+const ScreenCastSessionIface = loadSubInterfaceXML(
+    'org.gnome.Mutter.ScreenCast.Session', 'org.gnome.Mutter.ScreenCast');
+const ScreenCastStreamIface = loadSubInterfaceXML(
+    'org.gnome.Mutter.ScreenCast.Stream', 'org.gnome.Mutter.ScreenCast');
+const ScreenCastProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastIface);
+const ScreenCastSessionProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastSessionIface);
+const ScreenCastStreamProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastStreamIface);
+
+const DEFAULT_PIPELINE = 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux';
+const DEFAULT_FRAMERATE = 30;
+const DEFAULT_DRAW_CURSOR = true;
+
+const PipelineState = {
+    INIT: 0,
+    PLAYING: 1,
+    FLUSHING: 2,
+    STOPPED: 3,
+};
+
+const SessionState = {
+    INIT: 0,
+    ACTIVE: 1,
+    STOPPED: 2,
+};
+
+var Recorder = class {
+    constructor(sessionPath, x, y, width, height, filePath, options,
+        invocation,
+        onErrorCallback) {
+        this._startInvocation = invocation;
+        this._dbusConnection = invocation.get_connection();
+        this._onErrorCallback = onErrorCallback;
+        this._stopInvocation = null;
+
+        this._pipelineIsPlaying = false;
+        this._sessionIsActive = false;
+
+        this._x = x;
+        this._y = y;
+        this._width = width;
+        this._height = height;
+        this._filePath = filePath;
+
+        this._pipelineString = DEFAULT_PIPELINE;
+        this._framerate = DEFAULT_FRAMERATE;
+        this._drawCursor = DEFAULT_DRAW_CURSOR;
+
+        this._applyOptions(options);
+        this._watchSender(invocation.get_sender());
+
+        this._initSession(sessionPath);
+    }
+
+    _applyOptions(options) {
+        for (const option in options)
+            options[option] = options[option].deep_unpack();
+
+        if (options['pipeline'] !== undefined)
+            this._pipelineString = options['pipeline'];
+        if (options['framerate'] !== undefined)
+            this._framerate = options['framerate'];
+        if ('draw-cursor' in options)
+            this._drawCursor = options['draw-cursor'];
+    }
+
+    _watchSender(sender) {
+        this._nameWatchId = this._dbusConnection.watch_name(
+            sender,
+            Gio.BusNameWatcherFlags.NONE,
+            null,
+            this._senderVanished.bind(this));
+    }
+
+    _unwatchSender() {
+        if (this._nameWatchId !== 0) {
+            this._dbusConnection.unwatch_name(this._nameWatchId);
+            this._nameWatchId = 0;
+        }
+    }
+
+    _senderVanished() {
+        this._unwatchSender();
+
+        this.stopRecording(null);
+    }
+
+    _notifyStopped() {
+        this._unwatchSender();
+        if (this._onStartedCallback)
+            this._onStartedCallback(this, false);
+        else if (this._onStoppedCallback)
+            this._onStoppedCallback(this);
+        else
+            this._onErrorCallback(this);
+    }
+
+    _onSessionClosed() {
+        switch (this._pipelineState) {
+        case PipelineState.STOPPED:
+            break;
+        default:
+            this._pipeline.set_state(Gst.State.NULL);
+            log(`Unexpected pipeline state: ${this._pipelineState}`);
+            break;
+        }
+        this._notifyStopped();
+    }
+
+    _initSession(sessionPath) {
+        this._sessionProxy = new ScreenCastSessionProxy(Gio.DBus.session,
+            'org.gnome.Mutter.ScreenCast',
+            sessionPath);
+        this._sessionProxy.connectSignal('Closed', this._onSessionClosed.bind(this));
+    }
+
+    _startPipeline(nodeId) {
+        this._ensurePipeline(nodeId);
+
+        const bus = this._pipeline.get_bus();
+        bus.add_watch(bus, this._onBusMessage.bind(this));
+
+        this._pipeline.set_state(Gst.State.PLAYING);
+        this._pipelineState = PipelineState.PLAYING;
+
+        this._onStartedCallback(this, true);
+        this._onStartedCallback = null;
+    }
+
+    startRecording(onStartedCallback) {
+        this._onStartedCallback = onStartedCallback;
+
+        const [streamPath] = this._sessionProxy.RecordAreaSync(
+            this._x, this._y,
+            this._width, this._height,
+            {
+                'is-recording': GLib.Variant.new('b', true),
+                'cursor-mode': GLib.Variant.new('u', this._drawCursor ? 1 : 0),
+            });
+
+        this._streamProxy = new ScreenCastStreamProxy(Gio.DBus.session,
+            'org.gnome.ScreenCast.Stream',
+            streamPath);
+
+        this._streamProxy.connectSignal('PipeWireStreamAdded',
+            (proxy, sender, params) => {
+                const [nodeId] = params;
+                this._startPipeline(nodeId);
+            });
+        this._sessionProxy.StartSync();
+        this._sessionState = SessionState.ACTIVE;
+    }
+
+    stopRecording(onStoppedCallback) {
+        this._pipelineState = PipelineState.FLUSHING;
+        this._onStoppedCallback = onStoppedCallback;
+        this._pipeline.send_event(Gst.Event.new_eos());
+    }
+
+    _stopSession() {
+        this._sessionProxy.StopSync();
+        this._sessionState = SessionState.STOPPED;
+    }
+
+    _onBusMessage(bus, message, _) {
+        switch (message.type) {
+        case Gst.MessageType.EOS:
+            this._pipeline.set_state(Gst.State.NULL);
+
+            switch (this._pipelineState) {
+            case PipelineState.FLUSHING:
+                this._pipelineState = PipelineState.STOPPED;
+                break;
+            default:
+                break;
+            }
+
+            switch (this._sessionState) {
+            case SessionState.ACTIVE:
+                this._stopSession();
+                break;
+            case SessionState.STOPPED:
+                this._notifyStopped();
+                break;
+            default:
+                break;
+            }
+
+            break;
+        default:
+            break;
+        }
+        return true;
+    }
+
+    _substituteThreadCount(pipelineDescr) {
+        const numProcessors = GLib.get_num_processors();
+        const numThreads = Math.min(Math.max(1, numProcessors), 64);
+        return pipelineDescr.replace(/%T/, numThreads);
+    }
+
+    _ensurePipeline(nodeId) {
+        const framerate = this._framerate;
+
+        let fullPipeline = `
+            pipewiresrc path=${nodeId}
+                        do-timestamp=true
+                        keepalive-time=1000
+                        resend-last=true !
+            video/x-raw,max-framerate=${framerate}/1 !
+            videoconvert !
+            ${this._pipelineString} !
+            filesink location="${this._filePath}"`;
+        fullPipeline = this._substituteThreadCount(fullPipeline);
+
+        this._pipeline = Gst.parse_launch_full(fullPipeline,
+            null,
+            Gst.ParseFlags.FATAL_ERRORS);
+    }
+};
+
+var ScreencastService = class extends ServiceImplementation {
+    constructor() {
+        super(ScreencastIface, '/org/gnome/Shell/Screencast');
+
+        Gst.init(null);
+
+        this._recorders = new Map();
+        this._senders = new Map();
+
+        this._lockdownSettings = new Gio.Settings({
+            schema_id: 'org.gnome.desktop.lockdown',
+        });
+
+        this._proxy = new ScreenCastProxy(Gio.DBus.session,
+            'org.gnome.Mutter.ScreenCast',
+            '/org/gnome/Mutter/ScreenCast');
+
+        this._introspectProxy = new IntrospectProxy(Gio.DBus.session,
+            'org.gnome.Shell.Introspect',
+            '/org/gnome/Shell/Introspect');
+    }
+
+    _removeRecorder(sender) {
+        this._recorders.delete(sender);
+        if (this._recorders.size === 0)
+            this.release();
+    }
+
+    _addRecorder(sender, recorder) {
+        this._recorders.set(sender, recorder);
+        if (this._recorders.size === 1)
+            this.hold();
+    }
+
+    _getAbsolutePath(filename) {
+        if (GLib.path_is_absolute(filename))
+            return filename;
+
+        let videoDir = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_VIDEOS);
+        if (!GLib.file_test(videoDir, GLib.FileTest.EXISTS))
+            videoDir = GLib.get_home_dir();
+
+        return GLib.build_filenamev([videoDir, filename]);
+    }
+
+    _generateFilePath(template) {
+        let filename = '';
+        let escape = false;
+
+        [...template].forEach(c => {
+            if (escape) {
+                switch (c) {
+                case '%':
+                    filename += '%';
+                    break;
+                case 'd': {
+                    const datetime = GLib.DateTime.new_now_local();
+                    const datestr = datetime.format('%0x');
+                    const datestrEscaped = datestr.replace(/\//g, '-');
+
+                    filename += datestrEscaped;
+                    break;
+                }
+
+                case 't': {
+                    const datetime = GLib.DateTime.new_now_local();
+                    const datestr = datetime.format('%0X');
+                    const datestrEscaped = datestr.replace(/\//g, ':');
+
+                    filename += datestrEscaped;
+                    break;
+                }
+
+                default:
+                    log(`Warning: Unknown escape ${c}`);
+                }
+
+                escape = false;
+            } else if (c === '%') {
+                escape = true;
+            } else {
+                filename += c;
+            }
+        });
+
+        if (escape)
+            filename += '%';
+
+        return this._getAbsolutePath(filename);
+    }
+
+    ScreencastAsync(params, invocation) {
+        let returnValue = [false, ''];
+
+        if (this._lockdownSettings.get_boolean('disable-save-to-disk')) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        const sender = invocation.get_sender();
+
+        if (this._recorders.get(sender)) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        const [sessionPath] = this._proxy.CreateSessionSync({});
+
+        const [fileTemplate, options] = params;
+        const [screenWidth, screenHeight] = this._introspectProxy.ScreenSize;
+        const filePath = this._generateFilePath(fileTemplate);
+
+        let recorder;
+
+        try {
+            recorder = new Recorder(
+                sessionPath,
+                0, 0,
+                screenWidth, screenHeight,
+                fileTemplate,
+                options,
+                invocation,
+                _recorder => this._removeRecorder(sender));
+        } catch (error) {
+            log(`Failed to create recorder: ${error.message}`);
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        this._addRecorder(sender, recorder);
+
+        try {
+            recorder.startRecording(
+                (_, result) => {
+                    if (result) {
+                        returnValue = [true, filePath];
+                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+                    } else {
+                        this._removeRecorder(sender);
+                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+                    }
+
+                });
+        } catch (error) {
+            log(`Failed to start recorder: ${error.message}`);
+            this._removeRecorder(sender);
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+        }
+    }
+
+    ScreencastAreaAsync(params, invocation) {
+        let returnValue = [false, ''];
+
+        if (this._lockdownSettings.get_boolean('disable-save-to-disk')) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        const sender = invocation.get_sender();
+
+        if (this._recorders.get(sender)) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        const [sessionPath] = this._proxy.CreateSessionSync({});
+
+        const [x, y, width, height, fileTemplate, options] = params;
+        const filePath = this._generateFilePath(fileTemplate);
+
+        let recorder;
+
+        try {
+            recorder = new Recorder(
+                sessionPath,
+                x, y,
+                width, height,
+                filePath,
+                options,
+                invocation,
+                _recorder => this._removeRecorder(sender));
+        } catch (error) {
+            log(`Failed to create recorder: ${error.message}`);
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        this._addRecorder(sender, recorder);
+
+        try {
+            recorder.startRecording(
+                (_, result) => {
+                    if (result) {
+                        returnValue = [true, filePath];
+                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+                    } else {
+                        this._removeRecorder(sender);
+                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+                    }
+
+                });
+        } catch (error) {
+            log(`Failed to start recorder: ${error.message}`);
+            this._removeRecorder(sender);
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+        }
+    }
+
+    StopScreencastAsync(params, invocation) {
+        const sender = invocation.get_sender();
+
+        const recorder = this._recorders.get(sender);
+        if (!recorder) {
+            invocation.return_value(GLib.Variant.new('(b)', [false]));
+            return;
+        }
+
+        recorder.stopRecording(() => {
+            this._removeRecorder(sender);
+            invocation.return_value(GLib.Variant.new('(b)', [true]));
+        });
+    }
+};
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -71,7 +71,7 @@ var AuthPrompt = GObject.registerClass({
        this._userVerifier.connect('verification-complete', this._onVerificationComplete.bind(this));
        this._userVerifier.connect('reset', this._onReset.bind(this));
        this._userVerifier.connect('smartcard-status-changed', this._onSmartcardStatusChanged.bind(this));
-        this._userVerifier.connect('ovirt-user-authenticated', this._onOVirtUserAuthenticated.bind(this));
+        this._userVerifier.connect('credential-manager-authenticated', this._onCredentialManagerAuthenticated.bind(this));
        this.smartcardDetected = this._userVerifier.smartcardDetected;

        this.connect('destroy', this._onDestroy.bind(this));
@ -242,7 +242,7 @@ var AuthPrompt = GObject.registerClass({
        this.emit('prompted');
    }

-    _onOVirtUserAuthenticated() {
+    _onCredentialManagerAuthenticated() {
        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
            this.reset();
    }
--- a/js/gdm/credentialManager.js
+++ b/js/gdm/credentialManager.js
@ -0,0 +1,24 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported CredentialManager */
+
+class CredentialManager {
+    constructor(service) {
+        this._token = null;
+        this._service = service;
+        this._authenticatedSignalId = null;
+    }
+
+    get token() {
+        return this._token;
+    }
+
+    set token(t) {
+        this._token = t;
+        if (this._token)
+            this.emit('user-authenticated', this._token);
+    }
+
+    get service() {
+        return this._service;
+    }
+}
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -810,8 +810,8 @@ var LoginDialog = GObject.registerClass({
            return;

        this._logoBin.destroy_all_children();
-        const [valid, resourceScale] = this._logoBin.get_resource_scale();
-        if (this._logoFile && valid) {
+        const resourceScale = this._logoBin.get_resource_scale();
+        if (this._logoFile) {
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
            this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
                                                                       -1, -1,
@ -953,16 +953,15 @@ var LoginDialog = GObject.registerClass({
        if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
            return;

+        if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+            this._authPrompt.reset();
+
        this._bindOpacity();
        this.ease({
            opacity: 255,
            duration: _FADE_ANIMATION_TIME,
            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => {
-                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                    this._authPrompt.reset();
-                this._unbindOpacity();
-            },
+            onComplete: () => this._unbindOpacity(),
        });
    }

--- a/js/gdm/oVirt.js
+++ b/js/gdm/oVirt.js
@ -3,6 +3,9 @@

 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
+const Credential = imports.gdm.credentialManager;
+
+var SERVICE_NAME = 'gdm-ovirtcred';

 const OVirtCredentialsIface = `
 <node>
@ -28,30 +31,14 @@ function OVirtCredentials() {
    return self;
 }

-var OVirtCredentialsManager = class {
+var OVirtCredentialsManager = class OVirtCredentialsManager extends Credential.CredentialManager {
    constructor() {
-        this._token = null;
-
+        super(SERVICE_NAME);
        this._credentials = new OVirtCredentials();
        this._credentials.connectSignal('UserAuthenticated',
-                                        this._onUserAuthenticated.bind(this));
-    }
-
-    _onUserAuthenticated(proxy, sender, [token]) {
-        this._token = token;
-        this.emit('user-authenticated', token);
-    }
-
-    hasToken() {
-        return this._token != null;
-    }
-
-    getToken() {
-        return this._token;
-    }
-
-    resetToken() {
-        this._token = null;
+            (proxy, sender, [token]) => {
+                this.token = token;
+            });
    }
 };
 Signals.addSignalMethods(OVirtCredentialsManager.prototype);
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@ -8,6 +8,7 @@ const Signals = imports.signals;
 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const OVirt = imports.gdm.oVirt;
+const Vmware = imports.gdm.vmware;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const SmartcardManager = imports.misc.smartcardManager;
@ -24,7 +25,6 @@ Gio._promisify(Gdm.UserVerifierProxy.prototype,
 var PASSWORD_SERVICE_NAME = 'gdm-password';
 var FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 var SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
-var OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
 var FADE_ANIMATION_TIME = 160;
 var CLONE_FADE_ANIMATION_TIME = 250;

@ -160,13 +160,20 @@ var ShellUserVerifier = class {

        this._failCounter = 0;

-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
+        this._credentialManagers = {};
+        this._credentialManagers[OVirt.SERVICE_NAME] = OVirt.getOVirtCredentialsManager();
+        this._credentialManagers[Vmware.SERVICE_NAME] = Vmware.getVmwareCredentialsManager();

-        if (this._oVirtCredentialsManager.hasToken())
-            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
+        for (let service in this._credentialManagers) {
+            if (this._credentialManagers[service].token) {
+                this._onCredentialManagerAuthenticated(this._credentialManagers[service],
+                    this._credentialManagers[service].token);
+            }

-        this._oVirtUserAuthenticatedId = this._oVirtCredentialsManager.connect('user-authenticated',
-                                                                               this._oVirtUserAuthenticated.bind(this));
+            this._credentialManagers[service]._authenticatedSignalId =
+                this._credentialManagers[service].connect('user-authenticated',
+                                                          this._onCredentialManagerAuthenticated.bind(this));
+        }
    }

    begin(userName, hold) {
@ -222,8 +229,11 @@ var ShellUserVerifier = class {
        this._smartcardManager.disconnect(this._smartcardRemovedId);
        this._smartcardManager = null;

-        this._oVirtCredentialsManager.disconnect(this._oVirtUserAuthenticatedId);
-        this._oVirtCredentialsManager = null;
+        for (let service in this._credentialManagers) {
+            let credentialManager = this._credentialManagers[service];
+            credentialManager.disconnect(credentialManager._authenticatedSignalId);
+            credentialManager = null;
+        }
    }

    answerQuery(serviceName, answer) {
@ -311,9 +321,9 @@ var ShellUserVerifier = class {
            });
    }

-    _oVirtUserAuthenticated(_token) {
-        this._preemptingService = OVIRT_SERVICE_NAME;
-        this.emit('ovirt-user-authenticated');
+    _onCredentialManagerAuthenticated(credentialManager, _token) {
+        this._preemptingService = credentialManager.service;
+        this.emit('credential-manager-authenticated');
    }

    _checkForSmartcard() {
@ -490,9 +500,12 @@ var ShellUserVerifier = class {
        if (!this.serviceIsForeground(serviceName))
            return;

-        if (serviceName == OVIRT_SERVICE_NAME) {
-            // The only question asked by this service is "Token?"
-            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
+        let token = null;
+        if (this._credentialManagers[serviceName])
+            token = this._credentialManagers[serviceName].token;
+
+        if (token) {
+            this.answerQuery(serviceName, token);
            return;
        }

@ -560,8 +573,10 @@ var ShellUserVerifier = class {
        // If the login failed with the preauthenticated oVirt credentials
        // then discard the credentials and revert to default authentication
        // mechanism.
-        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
-            this._oVirtCredentialsManager.resetToken();
+        let foregroundService = Object.keys(this._credentialManagers).find(service =>
+            this.serviceIsForeground(service));
+        if (foregroundService) {
+            this._credentialManagers[foregroundService].token = null;
            this._preemptingService = null;
            this._verificationFailed(false);
            return;
--- a/js/gdm/vmware.js
+++ b/js/gdm/vmware.js
@ -0,0 +1,54 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getVmwareCredentialsManager */
+
+const Gio = imports.gi.Gio;
+const Signals = imports.signals;
+const Credential = imports.gdm.credentialManager;
+
+const dbusPath = '/org/vmware/viewagent/Credentials';
+const dbusInterface = 'org.vmware.viewagent.Credentials';
+
+var SERVICE_NAME = 'gdm-vmwcred';
+
+const VmwareCredentialsIface = '<node> \
+<interface name="' + dbusInterface + '"> \
+<signal name="UserAuthenticated"> \
+    <arg type="s" name="token"/> \
+</signal> \
+</interface> \
+</node>';
+
+
+const VmwareCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(VmwareCredentialsIface);
+
+let _vmwareCredentialsManager = null;
+
+function VmwareCredentials() {
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+                                   g_interface_name: VmwareCredentialsInfo.name,
+                                   g_interface_info: VmwareCredentialsInfo,
+                                   g_name: dbusInterface,
+                                   g_object_path: dbusPath,
+                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
+    self.init(null);
+    return self;
+}
+
+var VmwareCredentialsManager = class VmwareCredentialsManager extends Credential.CredentialManager {
+    constructor() {
+        super(SERVICE_NAME);
+        this._credentials = new VmwareCredentials();
+        this._credentials.connectSignal('UserAuthenticated',
+            (proxy, sender, [token]) => {
+                this.token = token;
+            });
+    }
+};
+Signals.addSignalMethods(VmwareCredentialsManager.prototype);
+
+function getVmwareCredentialsManager() {
+    if (!_vmwareCredentialsManager)
+        _vmwareCredentialsManager = new VmwareCredentialsManager();
+
+    return _vmwareCredentialsManager;
+}
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@ -6,6 +6,8 @@
    <file>gdm/fingerprint.js</file>
    <file>gdm/loginDialog.js</file>
    <file>gdm/oVirt.js</file>
+    <file>gdm/credentialManager.js</file>
+    <file>gdm/vmware.js</file>
    <file>gdm/realmd.js</file>
    <file>gdm/util.js</file>

@ -30,6 +32,7 @@
    <file>misc/util.js</file>
    <file>misc/weather.js</file>

+    <file>perf/basic.js</file>
    <file>perf/core.js</file>
    <file>perf/hwtest.js</file>

@ -90,7 +93,6 @@
    <file>ui/ripples.js</file>
    <file>ui/runDialog.js</file>
    <file>ui/screenShield.js</file>
-    <file>ui/screencast.js</file>
    <file>ui/screenshot.js</file>
    <file>ui/scripting.js</file>
    <file>ui/search.js</file>
@ -108,6 +110,7 @@
    <file>ui/windowAttentionHandler.js</file>
    <file>ui/windowMenu.js</file>
    <file>ui/windowManager.js</file>
+    <file>ui/windowPreview.js</file>
    <file>ui/workspace.js</file>
    <file>ui/workspaceSwitcherPopup.js</file>
    <file>ui/workspaceThumbnail.js</file>
@ -134,7 +137,6 @@
    <file>ui/status/volume.js</file>
    <file>ui/status/bluetooth.js</file>
    <file>ui/status/remoteAccess.js</file>
-    <file>ui/status/screencast.js</file>
    <file>ui/status/system.js</file>
    <file>ui/status/thunderbolt.js</file>
  </gresource>
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported collectFromDatadirs, recursivelyDeleteDir,
-            recursivelyMoveDir, loadInterfaceXML */
+            recursivelyMoveDir, loadInterfaceXML, loadSubInterfaceXML */

 const { Gio, GLib } = imports.gi;
 const Config = imports.misc.config;
@ -67,14 +67,19 @@ function recursivelyMoveDir(srcDir, destDir) {
 }

 let _ifaceResource = null;
+function ensureIfaceResource() {
+    if (_ifaceResource)
+        return;
+
+    // don't use global.datadir so the method is usable from tests/tools
+    let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
+    let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
+    _ifaceResource = Gio.Resource.load(path);
+    _ifaceResource._register();
+}
+
 function loadInterfaceXML(iface) {
-    if (!_ifaceResource) {
-        // don't use global.datadir so the method is usable from tests/tools
-        let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
-        let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
-        _ifaceResource = Gio.Resource.load(path);
-        _ifaceResource._register();
-    }
+    ensureIfaceResource();

    let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
    let f = Gio.File.new_for_uri(uri);
@ -88,3 +93,25 @@ function loadInterfaceXML(iface) {

    return null;
 }
+
+function loadSubInterfaceXML(iface, ifaceFile) {
+    let xml = loadInterfaceXML(ifaceFile);
+    if (!xml)
+        return null;
+
+    let ifaceStartTag = `<interface name="${iface}">`;
+    let ifaceStopTag = '</interface>';
+    let ifaceStartIndex = xml.indexOf(ifaceStartTag);
+    let ifaceEndIndex = xml.indexOf(ifaceStopTag, ifaceStartIndex + 1) + ifaceStopTag.length;
+
+    let xmlHeader = '<!DOCTYPE node PUBLIC\n' +
+        '\'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\'\n' +
+        '\'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\'>\n' +
+        '<node>\n';
+    let xmlFooter = '</node>';
+
+    return (
+        xmlHeader +
+        xml.substr(ifaceStartIndex, ifaceEndIndex - ifaceStartIndex) +
+        xmlFooter);
+}
--- a/js/misc/introspect.js
+++ b/js/misc/introspect.js
@ -3,9 +3,9 @@ const { Gio, GLib, Meta, Shell, St } = imports.gi;

 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';
-const APP_WHITELIST = ['org.freedesktop.impl.portal.desktop.gtk'];
+const APP_ALLOWLIST = ['org.freedesktop.impl.portal.desktop.gtk'];

-const INTROSPECT_DBUS_API_VERSION = 2;
+const INTROSPECT_DBUS_API_VERSION = 3;

 const { loadInterfaceXML } = imports.misc.fileUtils;

@ -46,19 +46,24 @@ var IntrospectService = class {

        this._syncRunningApplications();

-        this._whitelistMap = new Map();
-        APP_WHITELIST.forEach(appName => {
+        this._allowlistMap = new Map();
+        APP_ALLOWLIST.forEach(appName => {
            Gio.DBus.watch_name(Gio.BusType.SESSION,
                appName,
                Gio.BusNameWatcherFlags.NONE,
-                (conn, name, owner) => this._whitelistMap.set(name, owner),
-                (conn, name) => this._whitelistMap.delete(name));
+                (conn, name, owner) => this._allowlistMap.set(name, owner),
+                (conn, name) => this._allowlistMap.delete(name));
        });

        this._settings = St.Settings.get();
        this._settings.connect('notify::enable-animations',
            this._syncAnimationsEnabled.bind(this));
        this._syncAnimationsEnabled();
+
+        const monitorManager = Meta.MonitorManager.get();
+        monitorManager.connect('monitors-changed',
+            this._syncScreenSize.bind(this));
+        this._syncScreenSize();
    }

    _isStandaloneApp(app) {
@ -69,8 +74,8 @@ var IntrospectService = class {
        return this._introspectSettings.get_boolean(INTROSPECT_KEY);
    }

-    _isSenderWhitelisted(sender) {
-        return [...this._whitelistMap.values()].includes(sender);
+    _isSenderAllowed(sender) {
+        return [...this._allowlistMap.values()].includes(sender);
    }

    _getSandboxedAppId(app) {
@ -133,7 +138,7 @@ var IntrospectService = class {
        if (this._isIntrospectEnabled())
            return true;

-        if (this._isSenderWhitelisted(invocation.get_sender()))
+        if (this._isSenderAllowed(invocation.get_sender()))
            return true;

        return false;
@ -209,10 +214,28 @@ var IntrospectService = class {
        }
    }

+    _syncScreenSize() {
+        const oldScreenWidth = this._screenWidth;
+        const oldScreenHeight = this._screenHeight;
+        this._screenWidth = global.screen_width;
+        this._screenHeight = global.screen_height;
+
+        if (oldScreenWidth !== this._screenWidth ||
+            oldScreenHeight !== this._screenHeight) {
+            const variant = new GLib.Variant('(ii)',
+                [this._screenWidth, this._screenHeight]);
+            this._dbusImpl.emit_property_changed('ScreenSize', variant);
+        }
+    }
+
    get AnimationsEnabled() {
        return this._animationsEnabled;
    }

+    get ScreenSize() {
+        return [this._screenWidth, this._screenHeight];
+    }
+
    get version() {
        return INTROSPECT_DBUS_API_VERSION;
    }
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -158,6 +158,23 @@ var LoginManagerSystemd = class {
        });
    }

+    canRebootToBootLoaderMenu(asyncCallback) {
+        this._proxy.CanRebootToBootLoaderMenuRemote((result, error) => {
+            if (error) {
+                asyncCallback(false, false);
+            } else {
+                const needsAuth = result[0] === 'challenge';
+                const canRebootToBootLoaderMenu = needsAuth || result[0] === 'yes';
+                asyncCallback(canRebootToBootLoaderMenu, needsAuth);
+            }
+        });
+    }
+
+    setRebootToBootLoaderMenu() {
+        /* Parameter is timeout in usec, show to menu for 60 seconds */
+        this._proxy.SetRebootToBootLoaderMenuRemote(60000000);
+    }
+
    listSessions(asyncCallback) {
        this._proxy.ListSessionsRemote((result, error) => {
            if (error)
@ -203,6 +220,13 @@ var LoginManagerDummy = class {
        asyncCallback(false, false);
    }

+    canRebootToBootLoaderMenu(asyncCallback) {
+        asyncCallback(false, false);
+    }
+
+    setRebootToBootLoaderMenu() {
+    }
+
    listSessions(asyncCallback) {
        asyncCallback([]);
    }
--- a/js/misc/parentalControlsManager.js
+++ b/js/misc/parentalControlsManager.js
@ -121,10 +121,10 @@ var ParentalControlsManager = GObject.registerClass({
    // Calculate whether the given app (a Gio.DesktopAppInfo) should be shown
    // on the desktop, in search results, etc. The app should be shown if:
    //  - The .desktop file doesn’t say it should be hidden.
-    //  - The executable from the .desktop file’s Exec line isn’t blacklisted in
+    //  - The executable from the .desktop file’s Exec line isn’t denied in
    //    the user’s parental controls.
    //  - None of the flatpak app IDs from the X-Flatpak and the
-    //    X-Flatpak-RenamedFrom lines are blacklisted in the user’s parental
+    //    X-Flatpak-RenamedFrom lines are denied in the user’s parental
    //    controls.
    shouldShowApp(appInfo) {
        // Quick decision?
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@ -21,6 +21,7 @@ const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy';
 const SensorProxyInterface = loadInterfaceXML('net.hadess.SensorProxy');

 const POWER_OFF_ACTION_ID        = 'power-off';
+const RESTART_ACTION_ID          = 'restart';
 const LOCK_SCREEN_ACTION_ID      = 'lock-screen';
 const LOGOUT_ACTION_ID           = 'logout';
 const SUSPEND_ACTION_ID          = 'suspend';
@ -40,41 +41,38 @@ function getDefault() {

 const SystemActions = GObject.registerClass({
    Properties: {
-        'can-power-off': GObject.ParamSpec.boolean('can-power-off',
-                                                   'can-power-off',
-                                                   'can-power-off',
-                                                   GObject.ParamFlags.READABLE,
-                                                   false),
-        'can-suspend': GObject.ParamSpec.boolean('can-suspend',
-                                                 'can-suspend',
-                                                 'can-suspend',
-                                                 GObject.ParamFlags.READABLE,
-                                                 false),
-        'can-lock-screen': GObject.ParamSpec.boolean('can-lock-screen',
-                                                     'can-lock-screen',
-                                                     'can-lock-screen',
-                                                     GObject.ParamFlags.READABLE,
-                                                     false),
-        'can-switch-user': GObject.ParamSpec.boolean('can-switch-user',
-                                                     'can-switch-user',
-                                                     'can-switch-user',
-                                                     GObject.ParamFlags.READABLE,
-                                                     false),
-        'can-logout': GObject.ParamSpec.boolean('can-logout',
-                                                'can-logout',
-                                                'can-logout',
-                                                GObject.ParamFlags.READABLE,
-                                                false),
-        'can-lock-orientation': GObject.ParamSpec.boolean('can-lock-orientation',
-                                                          'can-lock-orientation',
-                                                          'can-lock-orientation',
-                                                          GObject.ParamFlags.READABLE,
-                                                          false),
-        'orientation-lock-icon': GObject.ParamSpec.string('orientation-lock-icon',
-                                                          'orientation-lock-icon',
-                                                          'orientation-lock-icon',
-                                                          GObject.ParamFlags.READWRITE,
-                                                          null),
+        'can-power-off': GObject.ParamSpec.boolean(
+            'can-power-off', 'can-power-off', 'can-power-off',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-restart': GObject.ParamSpec.boolean(
+            'can-restart', 'can-restart', 'can-restart',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-suspend': GObject.ParamSpec.boolean(
+            'can-suspend', 'can-suspend', 'can-suspend',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-lock-screen': GObject.ParamSpec.boolean(
+            'can-lock-screen', 'can-lock-screen', 'can-lock-screen',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-switch-user': GObject.ParamSpec.boolean(
+            'can-switch-user', 'can-switch-user', 'can-switch-user',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-logout': GObject.ParamSpec.boolean(
+            'can-logout', 'can-logout', 'can-logout',
+            GObject.ParamFlags.READABLE,
+            false),
+        'can-lock-orientation': GObject.ParamSpec.boolean(
+            'can-lock-orientation', 'can-lock-orientation', 'can-lock-orientation',
+            GObject.ParamFlags.READABLE,
+            false),
+        'orientation-lock-icon': GObject.ParamSpec.string(
+            'orientation-lock-icon', 'orientation-lock-icon', 'orientation-lock-icon',
+            GObject.ParamFlags.READWRITE,
+            null),
    },
 }, class SystemActions extends GObject.Object {
    _init() {
@ -93,7 +91,15 @@ const SystemActions = GObject.registerClass({
            name: C_("search-result", "Power Off"),
            iconName: 'system-shutdown-symbolic',
            // Translators: A list of keywords that match the power-off action, separated by semicolons
-            keywords: tokenizeKeywords(_('power off;shutdown;reboot;restart;halt;stop')),
+            keywords: tokenizeKeywords(_('power off;shutdown;halt;stop')),
+            available: false,
+        });
+        this._actions.set(RESTART_ACTION_ID, {
+            // Translators: The name of the restart action in search
+            name: C_('search-result', 'Restart'),
+            iconName: 'system-reboot-symbolic',
+            // Translators: A list of keywords that match the restart action, separated by semicolons
+            keywords: tokenizeKeywords(_('reboot;restart;')),
            available: false,
        });
        this._actions.set(LOCK_SCREEN_ACTION_ID, {
@ -203,6 +209,11 @@ const SystemActions = GObject.registerClass({
        return this._actions.get(POWER_OFF_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
+    get can_restart() {
+        return this._actions.get(RESTART_ACTION_ID).available;
+    }
+
    // eslint-disable-next-line camelcase
    get can_suspend() {
        return this._actions.get(SUSPEND_ACTION_ID).available;
@ -306,6 +317,9 @@ const SystemActions = GObject.registerClass({
        case POWER_OFF_ACTION_ID:
            this.activatePowerOff();
            break;
+        case RESTART_ACTION_ID:
+            this.activateRestart();
+            break;
        case LOCK_SCREEN_ACTION_ID:
            this.activateLockScreen();
            break;
@ -347,6 +361,9 @@ const SystemActions = GObject.registerClass({
                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
        this._actions.get(POWER_OFF_ACTION_ID).available = this._canHavePowerOff && !disabled;
        this.notify('can-power-off');
+
+        this._actions.get(RESTART_ACTION_ID).available = this._canHavePowerOff && !disabled;
+        this.notify('can-restart');
    }

    _updateHaveSuspend() {
@ -445,6 +462,13 @@ const SystemActions = GObject.registerClass({
        this._session.ShutdownRemote(0);
    }

+    activateRestart() {
+        if (!this._actions.get(RESTART_ACTION_ID).available)
+            throw new Error('The restart action is not available!');
+
+        this._session.RebootRemote();
+    }
+
    activateSuspend() {
        if (!this._actions.get(SUSPEND_ACTION_ID).available)
            throw new Error('The suspend action is not available!');
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -1,9 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnCommandLine,
            formatTime, formatTimeSpan, createTimeLabel, insertSorted,
-            makeCloseButton, ensureActorVisibleInScrollView, wiggle */
+            ensureActorVisibleInScrollView, wiggle */

-const { Clutter, Gio, GLib, GObject, Shell, St, GnomeDesktop } = imports.gi;
+const { Clutter, Gio, GLib, Shell, St, GnomeDesktop } = imports.gi;
 const Gettext = imports.gettext;

 const Main = imports.ui.main;
@ -363,51 +363,6 @@ function insertSorted(array, val, cmp) {
    return pos;
 }

-var CloseButton = GObject.registerClass(
-class CloseButton extends St.Button {
-    _init(boxpointer) {
-        super._init({
-            style_class: 'notification-close',
-            x_expand: true,
-            y_expand: true,
-            x_align: Clutter.ActorAlign.END,
-            y_align: Clutter.ActorAlign.START,
-        });
-
-        this._boxPointer = boxpointer;
-        if (boxpointer)
-            this._boxPointer.connect('arrow-side-changed', this._sync.bind(this));
-    }
-
-    _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.get_stage())
-            return 0;
-
-        let side = this._boxPointer.arrowSide;
-        if (side == St.Side.TOP)
-            return this._boxPointer.getArrowHeight();
-        else
-            return 0;
-    }
-
-    _sync() {
-        let themeNode = this.get_theme_node();
-
-        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x');
-        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
-    }
-
-    vfunc_style_changed() {
-        this._sync();
-        super.vfunc_style_changed();
-    }
-});
-
-function makeCloseButton(boxpointer) {
-    return new CloseButton(boxpointer);
-}
-
 function ensureActorVisibleInScrollView(scrollView, actor) {
    let adjustment = scrollView.vscroll.adjustment;
    let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
--- a/js/perf/basic.js
+++ b/js/perf/basic.js
@ -0,0 +1,146 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported run, finish, script_topBarNavDone, script_notificationShowDone,
+   script_notificationCloseDone, script_overviewShowDone,
+   script_applicationsShowStart, script_applicationsShowDone, METRICS,
+*/
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
+
+const { St } = imports.gi;
+
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const Scripting = imports.ui.scripting;
+
+// This script tests the most important (basic) functionality of the shell.
+
+var METRICS = {};
+
+async function run() {
+    /* eslint-disable no-await-in-loop */
+    Scripting.defineScriptEvent('topBarNavStart', 'Starting to navigate the top bar');
+    Scripting.defineScriptEvent('topBarNavDone', 'Done navigating the top bar');
+    Scripting.defineScriptEvent('notificationShowStart', 'Showing a notification');
+    Scripting.defineScriptEvent('notificationShowDone', 'Done showing a notification');
+    Scripting.defineScriptEvent('notificationCloseStart', 'Closing a notification');
+    Scripting.defineScriptEvent('notificationCloseDone', 'Done closing a notification');
+    Scripting.defineScriptEvent('overviewShowStart', 'Starting to show the overview');
+    Scripting.defineScriptEvent('overviewShowDone', 'Overview finished showing');
+    Scripting.defineScriptEvent('applicationsShowStart', 'Starting to switch to applications view');
+    Scripting.defineScriptEvent('applicationsShowDone', 'Done switching to applications view');
+
+    Main.overview.connect('shown',
+        () => Scripting.scriptEvent('overviewShowDone'));
+
+    await Scripting.sleep(1000);
+
+    // navigate through top bar
+    Scripting.scriptEvent('topBarNavStart');
+    Main.panel.statusArea.aggregateMenu.menu.open();
+    await Scripting.sleep(400);
+
+    const { menuManager } = Main.panel;
+    while (menuManager.activeMenu &&
+        Main.panel.navigate_focus(menuManager.activeMenu.sourceActor,
+            St.DirectionType.TAB_BACKWARD, false))
+        await Scripting.sleep(400);
+    Scripting.scriptEvent('topBarNavDone');
+
+    await Scripting.sleep(1000);
+
+    // notification
+    const source = new MessageTray.SystemNotificationSource();
+    Main.messageTray.add(source);
+
+    Scripting.scriptEvent('notificationShowStart');
+    source.connect('notification-show',
+        () => Scripting.scriptEvent('notificationShowDone'));
+
+    const notification = new MessageTray.Notification(source,
+        'A test notification');
+    source.showNotification(notification);
+    await Scripting.sleep(400);
+
+    Main.panel.statusArea.dateMenu.menu.open();
+    await Scripting.sleep(400);
+
+    Scripting.scriptEvent('notificationCloseStart');
+    notification.connect('destroy',
+        () => Scripting.scriptEvent('notificationCloseDone'));
+
+    notification.destroy();
+    await Scripting.sleep(400);
+
+    Main.panel.statusArea.dateMenu.menu.close();
+    await Scripting.waitLeisure();
+
+    await Scripting.sleep(1000);
+
+    // overview (window picker)
+    Scripting.scriptEvent('overviewShowStart');
+    Main.overview.show();
+    await Scripting.waitLeisure();
+    Main.overview.hide();
+    await Scripting.waitLeisure();
+
+    await Scripting.sleep(1000);
+
+    // overview (app picker)
+    Main.overview.show();
+    await Scripting.waitLeisure();
+
+    Scripting.scriptEvent('applicationsShowStart');
+    // eslint-disable-next-line require-atomic-updates
+    Main.overview.dash.showAppsButton.checked = true;
+    await Scripting.waitLeisure();
+    Scripting.scriptEvent('applicationsShowDone');
+    // eslint-disable-next-line require-atomic-updates
+    Main.overview.dash.showAppsButton.checked = false;
+    await Scripting.waitLeisure();
+
+    Main.overview.hide();
+    await Scripting.waitLeisure();
+    /* eslint-enable no-await-in-loop */
+}
+
+let topBarNav = false;
+let notificationShown = false;
+let notificationClosed = false;
+let windowPickerShown = false;
+let appPickerShown = false;
+
+function script_topBarNavDone() {
+    topBarNav = true;
+}
+
+function script_notificationShowDone() {
+    notificationShown = true;
+}
+
+function script_notificationCloseDone() {
+    notificationClosed = true;
+}
+
+function script_overviewShowDone() {
+    windowPickerShown = true;
+}
+
+function script_applicationsShowDone() {
+    appPickerShown = true;
+}
+
+function finish() {
+    if (!topBarNav)
+        throw new Error('Failed to navigate top bar');
+
+    if (!notificationShown)
+        throw new Error('Failed to show notification');
+
+    if (!notificationClosed)
+        throw new Error('Failed to close notification');
+
+    if (!windowPickerShown)
+        throw new Error('Failed to show window picker');
+
+    if (!appPickerShown)
+        throw new Error('Failed to show app picker');
+}
--- a/js/perf/core.js
+++ b/js/perf/core.js
@ -70,7 +70,8 @@ let WINDOW_CONFIGS = [
    { width: 640, height: 480, alpha: true,  maximized: false, count: 10, metric: 'overviewFps10Alpha' },
 ];

-function *run() {
+async function run() {
+    /* eslint-disable no-await-in-loop */
    Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
    Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
    Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview");
@ -84,7 +85,7 @@ function *run() {
        Scripting.scriptEvent('overviewShowDone');
    });

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    for (let i = 0; i < 2 * WINDOW_CONFIGS.length; i++) {
        // We go to the overview twice for each configuration; the first time
@ -92,49 +93,50 @@ function *run() {
        // a clean set of numbers.
        if ((i % 2) == 0) {
            let config = WINDOW_CONFIGS[i / 2];
-            yield Scripting.destroyTestWindows();
+            await Scripting.destroyTestWindows();

            for (let k = 0; k < config.count; k++) {
-                yield Scripting.createTestWindow({ width: config.width,
+                await Scripting.createTestWindow({ width: config.width,
                                                   height: config.height,
                                                   alpha: config.alpha,
                                                   maximized: config.maximized });
            }

-            yield Scripting.waitTestWindows();
-            yield Scripting.sleep(1000);
-            yield Scripting.waitLeisure();
+            await Scripting.waitTestWindows();
+            await Scripting.sleep(1000);
+            await Scripting.waitLeisure();
        }

        Scripting.scriptEvent('overviewShowStart');
        Main.overview.show();

-        yield Scripting.waitLeisure();
+        await Scripting.waitLeisure();
        Main.overview.hide();
-        yield Scripting.waitLeisure();
+        await Scripting.waitLeisure();

        System.gc();
-        yield Scripting.sleep(1000);
+        await Scripting.sleep(1000);
        Scripting.collectStatistics();
        Scripting.scriptEvent('afterShowHide');
    }

-    yield Scripting.destroyTestWindows();
-    yield Scripting.sleep(1000);
+    await Scripting.destroyTestWindows();
+    await Scripting.sleep(1000);

    Main.overview.show();
-    yield Scripting.waitLeisure();
+    await Scripting.waitLeisure();

    for (let i = 0; i < 2; i++) {
        Scripting.scriptEvent('applicationsShowStart');
        // eslint-disable-next-line require-atomic-updates
        Main.overview.dash.showAppsButton.checked = true;
-        yield Scripting.waitLeisure();
+        await Scripting.waitLeisure();
        Scripting.scriptEvent('applicationsShowDone');
        // eslint-disable-next-line require-atomic-updates
        Main.overview.dash.showAppsButton.checked = false;
-        yield Scripting.waitLeisure();
+        await Scripting.waitLeisure();
    }
+    /* eslint-enable no-await-in-loop */
 }

 let showingOverview = false;
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@ -94,7 +94,8 @@ function extractBootTimestamp() {
    return result;
 }

-function *run() {
+async function run() {
+    /* eslint-disable no-await-in-loop */
    Scripting.defineScriptEvent("desktopShown", "Finished initial animation");
    Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
    Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
@ -110,7 +111,7 @@ function *run() {
    Scripting.defineScriptEvent("geditLaunch", "gedit application launch");
    Scripting.defineScriptEvent("geditFirstFrame", "first frame of gedit window drawn");

-    yield Scripting.waitLeisure();
+    await Scripting.waitLeisure();
    Scripting.scriptEvent('desktopShown');

    let interfaceSettings = new Gio.Settings({
@ -120,22 +121,22 @@ function *run() {

    Scripting.scriptEvent('overviewShowStart');
    Main.overview.show();
-    yield Scripting.waitLeisure();
+    await Scripting.waitLeisure();
    Scripting.scriptEvent('overviewShowDone');

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    Scripting.scriptEvent('applicationsShowStart');
    // eslint-disable-next-line require-atomic-updates
    Main.overview.dash.showAppsButton.checked = true;

-    yield Scripting.waitLeisure();
+    await Scripting.waitLeisure();
    Scripting.scriptEvent('applicationsShowDone');

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    Main.overview.hide();
-    yield Scripting.waitLeisure();
+    await Scripting.waitLeisure();

    // --------------------- //
    // Tests of redraw speed //
@ -145,46 +146,46 @@ function *run() {
    global.frame_finish_timestamp = true;

    for (let k = 0; k < 5; k++)
-        yield Scripting.createTestWindow({ maximized: true });
-    yield Scripting.waitTestWindows();
+        await Scripting.createTestWindow({ maximized: true });
+    await Scripting.waitTestWindows();

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    Scripting.scriptEvent('mainViewDrawStart');
-    yield waitAndDraw(1000);
+    await waitAndDraw(1000);
    Scripting.scriptEvent('mainViewDrawDone');

    Main.overview.show();
    Scripting.waitLeisure();

-    yield Scripting.sleep(1500);
+    await Scripting.sleep(1500);

    Scripting.scriptEvent('overviewDrawStart');
-    yield waitAndDraw(1000);
+    await waitAndDraw(1000);
    Scripting.scriptEvent('overviewDrawDone');

-    yield Scripting.destroyTestWindows();
+    await Scripting.destroyTestWindows();
    Main.overview.hide();

-    yield Scripting.createTestWindow({ maximized: true,
+    await Scripting.createTestWindow({ maximized: true,
                                       redraws: true });
-    yield Scripting.waitTestWindows();
+    await Scripting.waitTestWindows();

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    Scripting.scriptEvent('redrawTestStart');
-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);
    Scripting.scriptEvent('redrawTestDone');

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);
    Scripting.scriptEvent('collectTimings');

-    yield Scripting.destroyTestWindows();
+    await Scripting.destroyTestWindows();

    global.frame_timestamps = false;
    global.frame_finish_timestamp = false;

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    let appSys = Shell.AppSystem.get_default();
    let app = appSys.lookup_app('org.gnome.gedit.desktop');
@ -197,21 +198,22 @@ function *run() {
        throw new Error('gedit was already running');

    while (windows.length == 0) {
-        yield waitSignal(global.display, 'window-created');
+        await waitSignal(global.display, 'window-created');
        windows = app.get_windows();
    }

    let actor = windows[0].get_compositor_private();
-    yield waitSignal(actor, 'first-frame');
+    await waitSignal(actor, 'first-frame');
    Scripting.scriptEvent('geditFirstFrame');

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    windows[0].delete(global.get_current_time());

-    yield Scripting.sleep(1000);
+    await Scripting.sleep(1000);

    interfaceSettings.set_boolean('enable-animations', true);
+    /* eslint-enable no-await-in-loop */
 }

 let overviewShowStart;
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -852,6 +852,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
        if (index === -1)
            return;

+        this._arrows[index].destroy();
+        this._arrows.splice(index, 1);
+
        this.icons.splice(index, 1);
        this.removeItem(index);
    }
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@ -60,7 +60,7 @@ class Animation extends St.Bin {
    }

    _loadFile(file, width, height) {
-        let [validResourceScale, resourceScale] = this.get_resource_scale();
+        const resourceScale = this.get_resource_scale();
        let wasPlaying = this._isPlaying;

        if (this._isPlaying)
@ -69,12 +69,6 @@ class Animation extends St.Bin {
        this._isLoaded = false;
        this.destroy_all_children();

-        if (!validResourceScale) {
-            if (wasPlaying)
-                this.play();
-            return;
-        }
-
        let textureCache = St.TextureCache.get_default();
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        this._animations = textureCache.load_sliced_image(file, width, height,
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -347,6 +347,8 @@ var Background = GObject.registerClass({
            this.set_color(color);
        else
            this.set_gradient(shadingType, color, secondColor);
+
+        this._setLoaded();
    }

    _watchFile(file) {
@ -512,8 +514,8 @@ var SystemBackground = GObject.registerClass({
        super._init({
            meta_display: global.display,
            monitor: 0,
-            background: _systemBackground,
        });
+        this.content.background = _systemBackground;

        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
            this.emit('loaded');
@ -712,13 +714,18 @@ var BackgroundManager = class BackgroundManager {
        }

        let newBackgroundActor = this._createBackgroundActor();
-        newBackgroundActor.vignette_sharpness = this.backgroundActor.vignette_sharpness;
-        newBackgroundActor.brightness = this.backgroundActor.brightness;
+
+        const oldContent = this.backgroundActor.content;
+        const newContent = newBackgroundActor.content;
+
+        newContent.vignette_sharpness = oldContent.vignette_sharpness;
+        newContent.brightness = oldContent.brightness;
+
        newBackgroundActor.visible = this.backgroundActor.visible;

        this._newBackgroundActor = newBackgroundActor;

-        let background = newBackgroundActor.background;
+        const { background } = newBackgroundActor.content;

        if (background.isLoaded) {
            this._swapBackgroundActor();
@ -738,6 +745,8 @@ var BackgroundManager = class BackgroundManager {
        let backgroundActor = new Meta.BackgroundActor({
            meta_display: global.display,
            monitor: this._monitorIndex,
+        });
+        backgroundActor.content.set({
            background,
            vignette: this._vignette,
            vignette_sharpness: 0.5,
@ -758,10 +767,27 @@ var BackgroundManager = class BackgroundManager {
            this._updateBackgroundActor();
        });

+        let loadedSignalId;
+        if (background.isLoaded) {
+            GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                this.emit('loaded');
+                return GLib.SOURCE_REMOVE;
+            });
+        } else {
+            loadedSignalId = background.connect('loaded', () => {
+                background.disconnect(loadedSignalId);
+                loadedSignalId = null;
+                this.emit('loaded');
+            });
+        }
+
        backgroundActor.connect('destroy', () => {
            if (changeSignalId)
                background.disconnect(changeSignalId);

+            if (loadedSignalId)
+                background.disconnect(loadedSignalId);
+
            if (backgroundActor.loadedSignalId)
                background.disconnect(backgroundActor.loadedSignalId);
        });
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BoxPointer */

-const { Clutter, GObject, Shell, St } = imports.gi;
+const { Clutter, GObject, St } = imports.gi;

 const Main = imports.ui.main;

@ -453,15 +453,16 @@ var BoxPointer = GObject.registerClass({
        let alignment = this._arrowAlignment;
        let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);

-        this._sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        this._sourceExtents = sourceActor.get_transformed_extents();
        this._workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);

        // Position correctly relative to the sourceActor
        let sourceNode = sourceActor.get_theme_node();
        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceAllocation = this._sourceAllocation;
-        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
-        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
+        let sourceTopLeft = this._sourceExtents.get_top_left();
+        let sourceBottomRight = this._sourceExtents.get_bottom_right();
+        let sourceCenterX = sourceTopLeft.x + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
+        let sourceCenterY = sourceTopLeft.y + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
        let [, , natWidth, natHeight] = this.get_preferred_size();

        // We also want to keep it onscreen, and separated from the
@ -481,16 +482,16 @@ var BoxPointer = GObject.registerClass({

        switch (this._arrowSide) {
        case St.Side.TOP:
-            resY = sourceAllocation.y2 + gap;
+            resY = sourceBottomRight.y + gap;
            break;
        case St.Side.BOTTOM:
-            resY = sourceAllocation.y1 - natHeight - gap;
+            resY = sourceTopLeft.y - natHeight - gap;
            break;
        case St.Side.LEFT:
-            resX = sourceAllocation.x2 + gap;
+            resX = sourceBottomRight.x + gap;
            break;
        case St.Side.RIGHT:
-            resX = sourceAllocation.x1 - natWidth - gap;
+            resX = sourceTopLeft.x - natWidth - gap;
            break;
        }

@ -586,29 +587,30 @@ var BoxPointer = GObject.registerClass({
    }

    _calculateArrowSide(arrowSide) {
-        let sourceAllocation = this._sourceAllocation;
+        let sourceTopLeft = this._sourceExtents.get_top_left();
+        let sourceBottomRight = this._sourceExtents.get_bottom_right();
        let [, , boxWidth, boxHeight] = this.get_preferred_size();
        let workarea = this._workArea;

        switch (arrowSide) {
        case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
-                boxHeight < sourceAllocation.y1 - workarea.y)
+            if (sourceBottomRight.y + boxHeight > workarea.y + workarea.height &&
+                boxHeight < sourceTopLeft.y - workarea.y)
                return St.Side.BOTTOM;
            break;
        case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < workarea.y &&
-                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
+            if (sourceTopLeft.y - boxHeight < workarea.y &&
+                boxHeight < workarea.y + workarea.height - sourceBottomRight.y)
                return St.Side.TOP;
            break;
        case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
-                boxWidth < sourceAllocation.x1 - workarea.x)
+            if (sourceBottomRight.x + boxWidth > workarea.x + workarea.width &&
+                boxWidth < sourceTopLeft.x - workarea.x)
                return St.Side.RIGHT;
            break;
        case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < workarea.x &&
-                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
+            if (sourceTopLeft.x - boxWidth < workarea.x &&
+                boxWidth < workarea.x + workarea.width - sourceBottomRight.x)
                return St.Side.LEFT;
            break;
        }
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -14,7 +14,6 @@ const { loadInterfaceXML } = imports.misc.fileUtils;

 var MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 var SHOW_WEEKDATE_KEY = 'show-weekdate';
-var ELLIPSIS_CHAR = '\u2026';

 var MESSAGE_ICON_SIZE = -1; // pick up from CSS

@ -32,10 +31,6 @@ function sameDay(dateA, dateB) {
    return sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
 }

-function isToday(date) {
-    return sameDay(new Date(), date);
-}
-
 function _isWorkDay(date) {
    /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
    let days = C_('calendar-no-work', "06");
@ -723,67 +718,6 @@ var Calendar = GObject.registerClass({
    }
 });

-var EventMessage = GObject.registerClass(
-class EventMessage extends MessageList.Message {
-    _init(event, date) {
-        super._init('', '');
-
-        this._date = date;
-
-        this.update(event);
-
-        this._icon = new St.Icon({ icon_name: 'x-office-calendar-symbolic' });
-        this.setIcon(this._icon);
-    }
-
-    vfunc_style_changed() {
-        let iconVisible = this.get_parent().has_style_pseudo_class('first-child');
-        this._icon.opacity = iconVisible ? 255 : 0;
-        super.vfunc_style_changed();
-    }
-
-    update(event) {
-        this._event = event;
-
-        this.setTitle(this._formatEventTime());
-        this.setBody(event.summary);
-    }
-
-    _formatEventTime() {
-        let periodBegin = _getBeginningOfDay(this._date);
-        let periodEnd = _getEndOfDay(this._date);
-        let allDay = this._event.allDay || (this._event.date <= periodBegin &&
-                                             this._event.end >= periodEnd);
-        let title;
-        if (allDay) {
-            /* Translators: Shown in calendar event list for all day events
-             * Keep it short, best if you can use less then 10 characters
-             */
-            title = C_("event list time", "All Day");
-        } else {
-            let date = this._event.date >= periodBegin
-                ? this._event.date
-                : this._event.end;
-            title = Util.formatTime(date, { timeOnly: true });
-        }
-
-        let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
-        if (this._event.date < periodBegin && !this._event.allDay) {
-            if (rtl)
-                title = '%s%s'.format(title, ELLIPSIS_CHAR);
-            else
-                title = '%s%s'.format(ELLIPSIS_CHAR, title);
-        }
-        if (this._event.end > periodEnd && !this._event.allDay) {
-            if (rtl)
-                title = '%s%s'.format(ELLIPSIS_CHAR, title);
-            else
-                title = '%s%s'.format(title, ELLIPSIS_CHAR);
-        }
-        return title;
-    }
-});
-
 var NotificationMessage = GObject.registerClass(
 class NotificationMessage extends MessageList.Message {
    _init(notification) {
@ -849,149 +783,6 @@ class NotificationMessage extends MessageList.Message {
    }
 });

-var EventsSection = GObject.registerClass(
-class EventsSection extends MessageList.MessageListSection {
-    _init() {
-        super._init();
-
-        this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
-        this._desktopSettings.connect('changed', this._reloadEvents.bind(this));
-        this._eventSource = new EmptyEventSource();
-
-        this._messageById = new Map();
-
-        this._title = new St.Button({ style_class: 'events-section-title',
-                                      label: '',
-                                      can_focus: true });
-        this._title.child.x_align = Clutter.ActorAlign.START;
-        this.insert_child_below(this._title, null);
-
-        this._title.connect('clicked', this._onTitleClicked.bind(this));
-        this._title.connect('key-focus-in', this._onKeyFocusIn.bind(this));
-
-        this._appSys = Shell.AppSystem.get_default();
-        this._appSys.connect('installed-changed',
-            this._appInstalledChanged.bind(this));
-        this._appInstalledChanged();
-    }
-
-    setEventSource(eventSource) {
-        if (!(eventSource instanceof EventSourceBase))
-            throw new Error('Event source is not valid type');
-
-        this._eventSource = eventSource;
-        this._eventSource.connect('changed', this._reloadEvents.bind(this));
-    }
-
-    get allowed() {
-        return Main.sessionMode.showCalendarEvents;
-    }
-
-    _updateTitle() {
-        this._title.visible = !isToday(this._date);
-
-        if (!this._title.visible)
-            return;
-
-        let dayFormat;
-        let now = new Date();
-        if (sameYear(this._date, now)) {
-            /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayFormat = Shell.util_translate_time_string(NC_("calendar heading", "%A, %B %-d"));
-        } else {
-            /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayFormat = Shell.util_translate_time_string(NC_("calendar heading", "%A, %B %-d, %Y"));
-        }
-        this._title.label = this._date.toLocaleFormat(dayFormat);
-    }
-
-    _reloadEvents() {
-        if (this._eventSource.isLoading || this._reloading)
-            return;
-
-        this._reloading = true;
-
-        let periodBegin = _getBeginningOfDay(this._date);
-        let periodEnd = _getEndOfDay(this._date);
-        let events = this._eventSource.getEvents(periodBegin, periodEnd);
-
-        let ids = events.map(e => e.id);
-        this._messageById.forEach((message, id) => {
-            if (ids.includes(id))
-                return;
-            this._messageById.delete(id);
-            this.removeMessage(message);
-        });
-
-        for (let i = 0; i < events.length; i++) {
-            let event = events[i];
-
-            let message = this._messageById.get(event.id);
-            if (!message) {
-                message = new EventMessage(event, this._date);
-                this._messageById.set(event.id, message);
-                this.addMessage(message, false);
-            } else {
-                message.update(event);
-                this.moveMessage(message, i, false);
-            }
-        }
-
-        this._reloading = false;
-        this._sync();
-    }
-
-    _appInstalledChanged() {
-        this._calendarApp = undefined;
-        this._title.reactive = this._getCalendarApp() != null;
-    }
-
-    _getCalendarApp() {
-        if (this._calendarApp !== undefined)
-            return this._calendarApp;
-
-        let apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
-        if (apps && (apps.length > 0)) {
-            let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
-            let defaultInRecommended = apps.some(a => a.equal(app));
-            this._calendarApp = defaultInRecommended ? app : apps[0];
-        } else {
-            this._calendarApp = null;
-        }
-        return this._calendarApp;
-    }
-
-    _onTitleClicked() {
-        Main.overview.hide();
-        Main.panel.closeCalendar();
-
-        let appInfo = this._getCalendarApp();
-        if (appInfo.get_id() === 'org.gnome.Evolution.desktop') {
-            let app = this._appSys.lookup_app('evolution-calendar.desktop');
-            if (app)
-                appInfo = app.app_info;
-        }
-        appInfo.launch([], global.create_app_launch_context(0, -1));
-    }
-
-    setDate(date) {
-        super.setDate(date);
-        this._updateTitle();
-        this._reloadEvents();
-    }
-
-    _shouldShow() {
-        return !this.empty || !isToday(this._date);
-    }
-
-    _sync() {
-        if (this._reloading)
-            return;
-
-        super._sync();
-    }
-});
-
 var TimeLabel = GObject.registerClass(
 class NotificationTimeLabel extends St.Label {
    _init(datetime) {
@ -1088,10 +879,6 @@ class NotificationSection extends MessageList.MessageListSection {
        });
        super.vfunc_map();
    }
-
-    _shouldShow() {
-        return !this.empty && isToday(this._date);
-    }
 });

 var Placeholder = GObject.registerClass(
@ -1100,41 +887,13 @@ class Placeholder extends St.BoxLayout {
        super._init({ style_class: 'message-list-placeholder', vertical: true });
        this._date = new Date();

-        let todayFile = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/no-notifications.svg');
-        let otherFile = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/no-events.svg');
-        this._todayIcon = new Gio.FileIcon({ file: todayFile });
-        this._otherIcon = new Gio.FileIcon({ file: otherFile });
-
-        this._icon = new St.Icon();
+        const file = Gio.File.new_for_uri(
+            'resource:///org/gnome/shell/theme/no-notifications.svg');
+        this._icon = new St.Icon({ gicon: new Gio.FileIcon({ file }) });
        this.add_actor(this._icon);

-        this._label = new St.Label();
+        this._label = new St.Label({ text: _('No Notifications') });
        this.add_actor(this._label);
-
-        this._sync();
-    }
-
-    setDate(date) {
-        if (sameDay(this._date, date))
-            return;
-        this._date = date;
-        this._sync();
-    }
-
-    _sync() {
-        let today = isToday(this._date);
-        if (today && this._icon.gicon == this._todayIcon)
-            return;
-        if (!today && this._icon.gicon == this._otherIcon)
-            return;
-
-        if (today) {
-            this._icon.gicon = this._todayIcon;
-            this._label.text = _("No Notifications");
-        } else {
-            this._icon.gicon = this._otherIcon;
-            this._label.text = _("No Events");
-        }
    }
 });

@ -1235,9 +994,6 @@ class CalendarMessageList extends St.Widget {
        this._notificationSection = new NotificationSection();
        this._addSection(this._notificationSection);

-        this._eventsSection = new EventsSection();
-        this._addSection(this._eventsSection);
-
        Main.sessionMode.connect('updated', this._sync.bind(this));
    }

@ -1273,13 +1029,4 @@ class CalendarMessageList extends St.Widget {
        let canClear = sections.some(s => s.canClear && s.visible);
        this._clearButton.reactive = canClear;
    }
-
-    setEventSource(eventSource) {
-        this._eventsSection.setEventSource(eventSource);
-    }
-
-    setDate(date) {
-        this._sectionList.get_children().forEach(s => s.setDate(date));
-        this._placeholder.setDate(date);
-    }
 });
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -13,7 +13,11 @@ const System = imports.system;

 const { loadInterfaceXML } = imports.misc.fileUtils;

+const NC_ = (context, str) => '%s\u0004%s'.format(context, str);
+const T_ = Shell.util_translate_time_string;
+
 const MAX_FORECASTS = 5;
+const ELLIPSIS_CHAR = '\u2026';

 const ClocksIntegrationIface = loadInterfaceXML('org.gnome.Shell.ClocksIntegration');
 const ClocksProxy = Gio.DBusProxy.makeProxyWrapper(ClocksIntegrationIface);
@ -84,6 +88,188 @@ class TodayButton extends St.Button {
    }
 });

+var EventsSection = GObject.registerClass(
+class EventsSection extends St.Button {
+    _init() {
+        super._init({
+            style_class: 'events-button',
+            can_focus: true,
+            x_expand: true,
+            child: new St.BoxLayout({
+                style_class: 'events-box',
+                vertical: true,
+                x_expand: true,
+            }),
+        });
+
+        this._startDate = null;
+        this._endDate = null;
+
+        this._eventSource = null;
+        this._calendarApp = null;
+
+        this._title = new St.Label({
+            style_class: 'events-title',
+        });
+        this.child.add_child(this._title);
+
+        this._eventsList = new St.BoxLayout({
+            style_class: 'events-list',
+            vertical: true,
+            x_expand: true,
+        });
+        this.child.add_child(this._eventsList);
+
+        this._appSys = Shell.AppSystem.get_default();
+        this._appSys.connect('installed-changed',
+            this._appInstalledChanged.bind(this));
+        this._appInstalledChanged();
+    }
+
+    setDate(date) {
+        const day = [date.getFullYear(), date.getMonth(), date.getDate()];
+        this._startDate = new Date(...day);
+        this._endDate = new Date(...day, 23, 59, 59, 999);
+
+        this._updateTitle();
+        this._reloadEvents();
+    }
+
+    setEventSource(eventSource) {
+        if (!(eventSource instanceof Calendar.EventSourceBase))
+            throw new Error('Event source is not valid type');
+
+        this._eventSource = eventSource;
+        this._eventSource.connect('changed', this._reloadEvents.bind(this));
+        this._eventSource.connect('notify::has-calendars',
+            this._sync.bind(this));
+        this._sync();
+    }
+
+    _updateTitle() {
+        /* Translators: Shown on calendar heading when selected day occurs on current year */
+        const sameYearFormat = T_(NC_('calendar heading', '%B %-d'));
+
+        /* Translators: Shown on calendar heading when selected day occurs on different year */
+        const otherYearFormat = T_(NC_('calendar heading', '%B %-d %Y'));
+
+        const timeSpanDay = GLib.TIME_SPAN_DAY / 1000;
+        const now = new Date();
+
+        if (this._startDate <= now && now <= this._endDate)
+            this._title.text = _('Today');
+        else if (this._endDate < now && now - this._endDate < timeSpanDay)
+            this._title.text = _('Yesterday');
+        else if (this._startDate > now && this._startDate - now < timeSpanDay)
+            this._title.text = _('Tomorrow');
+        else if (this._startDate.getFullYear() === now.getFullYear())
+            this._title.text = this._startDate.toLocaleFormat(sameYearFormat);
+        else
+            this._title.text = this._startDate.toLocaleFormat(otherYearFormat);
+    }
+
+    _formatEventTime(event) {
+        const allDay = event.allDay ||
+            (event.date <= this._startDate && event.end >= this._endDate);
+
+        let title;
+        if (allDay) {
+            /* Translators: Shown in calendar event list for all day events
+             * Keep it short, best if you can use less then 10 characters
+             */
+            title = C_('event list time', 'All Day');
+        } else {
+            let date = event.date >= this._startDate ? event.date : event.end;
+            title = Util.formatTime(date, { timeOnly: true });
+        }
+
+        const rtl = Clutter.get_default_text_direction() === Clutter.TextDirection.RTL;
+        if (event.date < this._startDate && !event.allDay) {
+            if (rtl)
+                title = '%s%s'.format(title, ELLIPSIS_CHAR);
+            else
+                title = '%s%s'.format(ELLIPSIS_CHAR, title);
+        }
+        if (event.end > this._endDate && !event.allDay) {
+            if (rtl)
+                title = '%s%s'.format(ELLIPSIS_CHAR, title);
+            else
+                title = '%s%s'.format(title, ELLIPSIS_CHAR);
+        }
+        return title;
+    }
+
+    _reloadEvents() {
+        if (this._eventSource.isLoading || this._reloading)
+            return;
+
+        this._reloading = true;
+
+        [...this._eventsList].forEach(c => c.destroy());
+
+        const events =
+            this._eventSource.getEvents(this._startDate, this._endDate);
+
+        for (let event of events) {
+            const box = new St.BoxLayout({
+                style_class: 'event-box',
+                vertical: true,
+            });
+            box.add(new St.Label({
+                text: event.summary,
+                style_class: 'event-summary',
+            }));
+            box.add(new St.Label({
+                text: this._formatEventTime(event),
+                style_class: 'event-time',
+            }));
+            this._eventsList.add_child(box);
+        }
+
+        if (this._eventsList.get_n_children() === 0) {
+            const placeholder = new St.Label({
+                text: _('No Events'),
+                style_class: 'event-placeholder',
+            });
+            this._eventsList.add_child(placeholder);
+        }
+
+        this._reloading = false;
+        this._sync();
+    }
+
+    vfunc_clicked() {
+        Main.overview.hide();
+        Main.panel.closeCalendar();
+
+        let appInfo = this._calendarApp;
+        if (appInfo.get_id() === 'org.gnome.Evolution.desktop') {
+            const app = this._appSys.lookup_app('evolution-calendar.desktop');
+            if (app)
+                appInfo = app.app_info;
+        }
+        appInfo.launch([], global.create_app_launch_context(0, -1));
+    }
+
+    _appInstalledChanged() {
+        const apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
+        if (apps && (apps.length > 0)) {
+            const app = Gio.AppInfo.get_default_for_type('text/calendar', false);
+            const defaultInRecommended = apps.some(a => a.equal(app));
+            this._calendarApp = defaultInRecommended ? app : apps[0];
+        } else {
+            this._calendarApp = null;
+        }
+
+        return this._sync();
+    }
+
+    _sync() {
+        this.visible = this._eventSource && this._eventSource.hasCalendars;
+        this.reactive = this._calendarApp !== null;
+    }
+});
+
 var WorldClocksSection = GObject.registerClass(
 class WorldClocksSection extends St.Button {
    _init() {
@ -598,6 +784,7 @@ class DateMenuButton extends PanelMenu.Button {

        this._clockDisplay = new St.Label({ style_class: 'clock' });
        this._clockDisplay.clutter_text.y_align = Clutter.ActorAlign.CENTER;
+        this._clockDisplay.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

        this._indicator = new MessagesIndicator();

@ -632,7 +819,7 @@ class DateMenuButton extends PanelMenu.Button {
        this._calendar.connect('selected-date-changed', (_calendar, datetime) => {
            let date = _gDateTimeToDate(datetime);
            layout.frozen = !_isToday(date);
-            this._messageList.setDate(date);
+            this._eventsItem.setDate(date);
        });

        this.menu.connect('open-state-changed', (menu, isOpen) => {
@ -641,7 +828,7 @@ class DateMenuButton extends PanelMenu.Button {
                let now = new Date();
                this._calendar.setDate(now);
                this._date.setDate(now);
-                this._messageList.setDate(now);
+                this._eventsItem.setDate(now);
            }
        });

@ -672,6 +859,9 @@ class DateMenuButton extends PanelMenu.Button {
                                             style_class: 'datemenu-displays-box' });
        this._displaysSection.add_actor(displaysBox);

+        this._eventsItem = new EventsSection();
+        displaysBox.add_child(this._eventsItem);
+
        this._clocksItem = new WorldClocksSection();
        displaysBox.add_child(this._clocksItem);

@ -697,7 +887,7 @@ class DateMenuButton extends PanelMenu.Button {
            this._eventSource.destroy();

        this._calendar.setEventSource(eventSource);
-        this._messageList.setEventSource(eventSource);
+        this._eventsItem.setEventSource(eventSource);

        this._eventSource = eventSource;
    }
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dialog, MessageDialogContent, ListSection, ListSectionItem */

-const { Clutter, GObject, Meta, Pango, St } = imports.gi;
+const { Clutter, GLib, GObject, Meta, Pango, St } = imports.gi;

 function _setLabel(label, value) {
    label.set({
@ -221,13 +221,16 @@ var MessageDialogContent = GObject.registerClass({
            this._updateTitleStyleLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                this._updateTitleStyleLater = 0;
                this._title.add_style_class_name('leightweight');
-                return false;
+                return GLib.SOURCE_REMOVE;
            });
        }

    }

    set title(title) {
+        if (this._title.text === title)
+            return;
+
        _setLabel(this._title, title);

        this._title.remove_style_class_name('leightweight');
@ -237,6 +240,9 @@ var MessageDialogContent = GObject.registerClass({
    }

    set description(description) {
+        if (this._description.text === description)
+            return;
+
        _setLabel(this._description, description);
        this.notify('description');
    }
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -375,19 +375,29 @@ var _Draggable = class _Draggable {

            this._dragActorSource = undefined;
            this._dragOrigParent = this.actor.get_parent();
-            this._dragOrigX = this._dragActor.x;
-            this._dragOrigY = this._dragActor.y;
+            this._dragActorHadFixedPos = this._dragActor.fixed_position_set;
+            this._dragOrigX = this._dragActor.allocation.x1;
+            this._dragOrigY = this._dragActor.allocation.y1;
+            this._dragOrigWidth = this._dragActor.allocation.get_width();
+            this._dragOrigHeight = this._dragActor.allocation.get_height();
            this._dragOrigScale = this._dragActor.scale_x;

+            // When the actor gets reparented to the uiGroup, it will be
+            // allocated its preferred size, so use that size instead of the
+            // current allocation size.
+            const [, newAllocatedWidth] = this._dragActor.get_preferred_width(-1);
+            const [, newAllocatedHeight] = this._dragActor.get_preferred_height(-1);
+
+            const transformedExtents = this._dragActor.get_transformed_extents();
+
            // Set the actor's scale such that it will keep the same
            // transformed size when it's reparented to the uiGroup
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this._dragActor.set_scale(scaledWidth / this.actor.width,
-                                      scaledHeight / this.actor.height);
+            this._dragActor.set_scale(
+                transformedExtents.get_width() / newAllocatedWidth,
+                transformedExtents.get_height() / newAllocatedHeight);

-            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
-            this._dragOffsetX = actorStageX - this._dragStartX;
-            this._dragOffsetY = actorStageY - this._dragStartY;
+            this._dragOffsetX = transformedExtents.origin.x - this._dragStartX;
+            this._dragOffsetY = transformedExtents.origin.y - this._dragStartY;

            this._dragOrigParent.remove_actor(this._dragActor);
            Main.uiGroup.add_child(this._dragActor);
@ -417,6 +427,10 @@ var _Draggable = class _Draggable {
        this._dragOffsetX -= transX;
        this._dragOffsetY -= transY;

+        this._dragActor.set_position(
+            this._dragX + this._dragOffsetX,
+            this._dragY + this._dragOffsetY);
+
        if (this._dragActorMaxSize != undefined) {
            let [scaledWidth, scaledHeight] = this._dragActor.get_transformed_size();
            let currentSize = Math.max(scaledWidth, scaledHeight);
@ -635,9 +649,15 @@ var _Draggable = class _Draggable {
            if (parentWidth != 0)
                parentScale = parentScaledWidth / parentWidth;

+            // Also adjust for the difference in the original actor width
+            // and the width it is now (children of uiGroup always get
+            // allocated their preferred size)
+            const childScaleX =
+                this._dragOrigWidth / this._dragActor.allocation.get_width();
+
            x = parentX + parentScale * this._dragOrigX;
            y = parentY + parentScale * this._dragOrigY;
-            scale = this._dragOrigScale * parentScale;
+            scale = this._dragOrigScale * parentScale * childScaleX;
        } else {
            // Snap back actor to its original stage position
            x = this._snapBackX;
@ -718,7 +738,10 @@ var _Draggable = class _Draggable {
            Main.uiGroup.remove_child(this._dragActor);
            this._dragOrigParent.add_actor(this._dragActor);
            dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
-            dragActor.set_position(this._dragOrigX, this._dragOrigY);
+            if (this._dragActorHadFixedPos)
+                dragActor.set_position(this._dragOrigX, this._dragOrigY);
+            else
+                dragActor.fixed_position_set = false;
        } else {
            dragActor.destroy();
        }
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -18,7 +18,7 @@
 */

 const { AccountsService, Clutter, Gio,
-        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
+        GLib, GObject, Pango, Polkit, Shell, St, UPowerGlib: UPower }  = imports.gi;

 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@ -31,24 +31,30 @@ const { loadInterfaceXML } = imports.misc.fileUtils;

 const _ITEM_ICON_SIZE = 64;

+const LOW_BATTERY_THRESHOLD = 30;
+
 const EndSessionDialogIface = loadInterfaceXML('org.gnome.SessionManager.EndSessionDialog');

 const logoutDialogContent = {
    subjectWithUser: C_("title", "Log Out %s"),
    subject: C_("title", "Log Out"),
    descriptionWithUser(user, seconds) {
-        return ngettext("%s will be logged out automatically in %d second.",
-                        "%s will be logged out automatically in %d seconds.",
-                        seconds).format(user, seconds);
+        return ngettext(
+            '%s will be logged out automatically in %d second.',
+            '%s will be logged out automatically in %d seconds.',
+            seconds).format(user, seconds);
    },
    description(seconds) {
-        return ngettext("You will be logged out automatically in %d second.",
-                        "You will be logged out automatically in %d seconds.",
-                        seconds).format(seconds);
+        return ngettext(
+            'You will be logged out automatically in %d second.',
+            'You will be logged out automatically in %d seconds.',
+            seconds).format(seconds);
    },
    showBatteryWarning: false,
-    confirmButtons: [{ signal: 'ConfirmedLogout',
-                       label: C_("button", "Log Out") }],
+    confirmButtons: [{
+        signal: 'ConfirmedLogout',
+        label: C_('button', 'Log Out'),
+    }],
    showOtherSessions: false,
 };

@ -56,30 +62,36 @@ const shutdownDialogContent = {
    subject: C_("title", "Power Off"),
    subjectWithUpdates: C_("title", "Install Updates & Power Off"),
    description(seconds) {
-        return ngettext("The system will power off automatically in %d second.",
-                        "The system will power off automatically in %d seconds.",
-                        seconds).format(seconds);
+        return ngettext(
+            'The system will power off automatically in %d second.',
+            'The system will power off automatically in %d seconds.',
+            seconds).format(seconds);
    },
    checkBoxText: C_("checkbox", "Install pending software updates"),
    showBatteryWarning: true,
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart") },
-                     { signal: 'ConfirmedShutdown',
-                       label: C_("button", "Power Off") }],
+    confirmButtons: [{
+        signal: 'ConfirmedShutdown',
+        label: C_('button', 'Power Off'),
+    }],
    iconName: 'system-shutdown-symbolic',
    showOtherSessions: true,
 };

 const restartDialogContent = {
    subject: C_("title", "Restart"),
+    subjectWithUpdates: C_('title', 'Install Updates & Restart'),
    description(seconds) {
-        return ngettext("The system will restart automatically in %d second.",
-                        "The system will restart automatically in %d seconds.",
-                        seconds).format(seconds);
+        return ngettext(
+            'The system will restart automatically in %d second.',
+            'The system will restart automatically in %d seconds.',
+            seconds).format(seconds);
    },
-    showBatteryWarning: false,
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart") }],
+    checkBoxText: C_('checkbox', 'Install pending software updates'),
+    showBatteryWarning: true,
+    confirmButtons: [{
+        signal: 'ConfirmedReboot',
+        label: C_('button', 'Restart'),
+    }],
    iconName: 'view-refresh-symbolic',
    showOtherSessions: true,
 };
@ -88,13 +100,16 @@ const restartUpdateDialogContent = {

    subject: C_("title", "Restart & Install Updates"),
    description(seconds) {
-        return ngettext("The system will automatically restart and install updates in %d second.",
-                        "The system will automatically restart and install updates in %d seconds.",
-                        seconds).format(seconds);
+        return ngettext(
+            'The system will automatically restart and install updates in %d second.',
+            'The system will automatically restart and install updates in %d seconds.',
+            seconds).format(seconds);
    },
    showBatteryWarning: true,
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart &amp; Install") }],
+    confirmButtons: [{
+        signal: 'ConfirmedReboot',
+        label: C_('button', 'Restart &amp; Install'),
+    }],
    unusedFutureButtonForTranslation: C_("button", "Install &amp; Power Off"),
    unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
    iconName: 'view-refresh-symbolic',
@ -112,8 +127,10 @@ const restartUpgradeDialogContent = {
    },
    disableTimer: true,
    showBatteryWarning: false,
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label: C_("button", "Restart &amp; Install") }],
+    confirmButtons: [{
+        signal: 'ConfirmedReboot',
+        label: C_('button', 'Restart &amp; Install'),
+    }],
    iconName: 'view-refresh-symbolic',
    showOtherSessions: true,
 };
@ -142,7 +159,7 @@ const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 const PkOfflineIface = loadInterfaceXML('org.freedesktop.PackageKit.Offline');
 const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface);

-const UPowerIface = loadInterfaceXML('org.freedesktop.UPower');
+const UPowerIface = loadInterfaceXML('org.freedesktop.UPower.Device');
 const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);

 function findAppFromInhibitor(inhibitor) {
@ -213,6 +230,11 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
                      destroyOnClose: false });

        this._loginManager = LoginManager.getLoginManager();
+        this._loginManager.canRebootToBootLoaderMenu(
+            (canRebootToBootLoaderMenu, unusedNeedsAuth) => {
+                this._canRebootToBootLoaderMenu = canRebootToBootLoaderMenu;
+            });
+
        this._userManager = AccountsService.UserManager.get_default();
        this._user = this._userManager.get_user(GLib.get_user_name());
        this._updatesPermission = null;
@ -224,7 +246,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {

        this._powerProxy = new UPowerProxy(Gio.DBus.system,
                                           'org.freedesktop.UPower',
-                                           '/org/freedesktop/UPower',
+                                           '/org/freedesktop/UPower/devices/DisplayDevice',
                                           (proxy, error) => {
                                               if (error) {
                                                   log(error.message);
@ -239,6 +261,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._totalSecondsToStayOpen = 0;
        this._applications = [];
        this._sessions = [];
+        this._capturedEventId = 0;
+        this._rebootButton = null;
+        this._rebootButtonAlt = null;

        this.connect('destroy',
                     this._onDestroy.bind(this));
@ -256,7 +281,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {

        this._batteryWarning = new St.Label({
            style_class: 'end-session-dialog-battery-warning',
-            text: _('Running on battery power: Please plug in before installing updates.'),
+            text: _('Low battery power: please plug in before installing updates.'),
        });
        this._batteryWarning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this._batteryWarning.clutter_text.line_wrap = true;
@ -306,6 +331,32 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._user.disconnect(this._userChangedId);
    }

+    _isDischargingBattery() {
+        return this._powerProxy.IsPresent &&
+            this._powerProxy.State !== UPower.DeviceState.CHARGING &&
+            this._powerProxy.State !== UPower.DeviceState.FULLY_CHARGED;
+    }
+
+    _isBatteryLow() {
+        return this._isDischargingBattery() && this._powerProxy.Percentage < LOW_BATTERY_THRESHOLD;
+    }
+
+    _shouldShowLowBatteryWarning(dialogContent) {
+        if (!dialogContent.showBatteryWarning)
+            return false;
+
+        if (!this._isBatteryLow())
+            return false;
+
+        if (this._checkBox.checked)
+            return true;
+
+        // Show the warning if updates have already been triggered, but
+        // the user doesn't have enough permissions to cancel them.
+        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
+        return this._updateInfo.UpdatePrepared && this._updateInfo.UpdateTriggered && !updatesAllowed;
+    }
+
    _sync() {
        let open = this.state == ModalDialog.State.OPENING || this.state == ModalDialog.State.OPENED;
        if (!open)
@ -319,10 +370,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        if (dialogContent.subjectWithUpdates && this._checkBox.checked)
            subject = dialogContent.subjectWithUpdates;

-        if (dialogContent.showBatteryWarning) {
-            this._batteryWarning.visible =
-                this._powerProxy.OnBattery && this._checkBox.checked;
-        }
+        this._batteryWarning.visible = this._shouldShowLowBatteryWarning(dialogContent);

        let description;
        let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
@ -363,16 +411,38 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._sessionSection.visible = hasSessions;
    }

-    _updateButtons() {
-        let dialogContent = DialogContent[this._type];
-        let buttons = [{ action: this.cancel.bind(this),
-                         label: _("Cancel"),
-                         key: Clutter.KEY_Escape }];
+    _onCapturedEvent(actor, event) {
+        let altEnabled = false;

+        let type = event.type();
+        if (type !== Clutter.EventType.KEY_PRESS && type !== Clutter.EventType.KEY_RELEASE)
+            return Clutter.EVENT_PROPAGATE;
+
+        let key = event.get_key_symbol();
+        if (key !== Clutter.KEY_Alt_L && key !== Clutter.KEY_Alt_R)
+            return Clutter.EVENT_PROPAGATE;
+
+        if (type === Clutter.EventType.KEY_PRESS)
+            altEnabled = true;
+
+        this._rebootButton.visible = !altEnabled;
+        this._rebootButtonAlt.visible = altEnabled;
+
+        return Clutter.EVENT_PROPAGATE;
+    }
+
+    _updateButtons() {
+        this.clearButtons();
+
+        this.addButton({ action: this.cancel.bind(this),
+                         label: _("Cancel"),
+                         key: Clutter.KEY_Escape });
+
+        let dialogContent = DialogContent[this._type];
        for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
            let signal = dialogContent.confirmButtons[i].signal;
            let label = dialogContent.confirmButtons[i].label;
-            buttons.push({
+            let button = this.addButton({
                action: () => {
                    this.close(true);
                    let signalId = this.connect('closed', () => {
@ -382,9 +452,34 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
                },
                label,
            });
-        }

-        this.setButtons(buttons);
+            // Add Alt "Boot Options" option to the Reboot button
+            if (this._canRebootToBootLoaderMenu && signal === 'ConfirmedReboot') {
+                this._rebootButton = button;
+                this._rebootButtonAlt = this.addButton({
+                    action: () => {
+                        this.close(true);
+                        let signalId = this.connect('closed', () => {
+                            this.disconnect(signalId);
+                            this._confirmRebootToBootLoaderMenu();
+                        });
+                    },
+                    label: C_('button', 'Boot Options'),
+                });
+                this._rebootButtonAlt.visible = false;
+                this._capturedEventId = global.stage.connect('captured-event',
+                    this._onCapturedEvent.bind(this));
+            }
+        }
+    }
+
+    _stopAltCapture() {
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+        this._rebootButton = null;
+        this._rebootButtonAlt = null;
    }

    close(skipSignal) {
@ -396,14 +491,21 @@ class EndSessionDialog extends ModalDialog.ModalDialog {

    cancel() {
        this._stopTimer();
+        this._stopAltCapture();
        this._dbusImpl.emit_signal('Canceled', null);
        this.close();
    }

+    _confirmRebootToBootLoaderMenu() {
+        this._loginManager.setRebootToBootLoaderMenu();
+        this._confirm('ConfirmedReboot');
+    }
+
    _confirm(signal) {
        let callback = () => {
            this._fadeOutDialog();
            this._stopTimer();
+            this._stopAltCapture();
            this._dbusImpl.emit_signal(signal, null);
        };

@ -671,19 +773,17 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        if (dialogContent.showOtherSessions)
            this._loadSessions();

-        let updateTriggered = this._updateInfo.UpdateTriggered;
-        let updatePrepared = this._updateInfo.UpdatePrepared;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
-        this._checkBox.visible = dialogContent.checkBoxText && updatePrepared && updatesAllowed;
-        this._checkBox.checked = this._checkBox.visible;
+        this._checkBox.visible = dialogContent.checkBoxText && this._updateInfo.UpdatePrepared && updatesAllowed;

-        // We show the warning either together with the checkbox, or when
-        // updates have already been triggered, but the user doesn't have
-        // enough permissions to cancel them.
-        this._batteryWarning.visible = dialogContent.showBatteryWarning &&
-                                        (this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed);
+        if (this._type === DialogType.UPGRADE_RESTART)
+            this._checkBox.checked = this._checkBox.visible && this._updateInfo.UpdateTriggered && !this._isDischargingBattery();
+        else
+            this._checkBox.checked = this._checkBox.visible && !this._isBatteryLow();
+
+        this._batteryWarning.visible = this._shouldShowLowBatteryWarning(dialogContent);

        this._updateButtons();

--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -134,7 +134,14 @@ function _easeActor(actor, params) {
        actor.set_easing_mode(params.mode);
    delete params.mode;

-    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
+    const prepare = () => {
+        Meta.disable_unredirect_for_display(global.display);
+        global.begin_work();
+    };
+    const cleanup = () => {
+        Meta.enable_unredirect_for_display(global.display);
+        global.end_work();
+    };
    let callback = _makeEaseCallback(params, cleanup);

    // cancel overwritten transitions
@ -149,9 +156,9 @@ function _easeActor(actor, params) {
        .find(t => t !== null);

    if (transition && transition.delay)
-        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
+        transition.connect('started', () => prepare());
    else
-        Meta.disable_unredirect_for_display(global.display);
+        prepare();

    if (transition) {
        transition.set({ repeatCount, autoReverse });
@ -191,7 +198,14 @@ function _easeActorProperty(actor, propName, target, params) {
    if (actor instanceof Clutter.Actor && !actor.mapped)
        duration = 0;

-    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
+    const prepare = () => {
+        Meta.disable_unredirect_for_display(global.display);
+        global.begin_work();
+    };
+    const cleanup = () => {
+        Meta.enable_unredirect_for_display(global.display);
+        global.end_work();
+    };
    let callback = _makeEaseCallback(params, cleanup);

    // cancel overwritten transition
@ -203,7 +217,7 @@ function _easeActorProperty(actor, propName, target, params) {
        if (!isReversed)
            obj[prop] = target;

-        Meta.disable_unredirect_for_display(global.display);
+        prepare();
        callback(true);

        return;
@ -222,9 +236,9 @@ function _easeActorProperty(actor, propName, target, params) {
    transition.set_to(target);

    if (transition.delay)
-        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
+        transition.connect('started', () => prepare());
    else
-        Meta.disable_unredirect_for_display(global.display);
+        prepare();

    transition.connect('stopped', (t, finished) => callback(finished));
 }
@ -362,6 +376,10 @@ function init() {
    const Format = imports.format;

    String.prototype.format = Format.format;
+
+    Math.clamp = function (x, lower, upper) {
+        return Math.min(Math.max(x, lower), upper);
+    };
 }

 // adjustAnimationTime:
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@ -139,7 +139,9 @@ function checkForUpdates() {
            return;
        if (extension.hasUpdate)
            return;
-        metadatas[uuid] = extension.metadata;
+        metadatas[uuid] = {
+            version: extension.metadata.version,
+        };
    });

    if (Object.keys(metadatas).length === 0)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@ -1,5 +1,5 @@
 /* exported InhibitShortcutsDialog */
-const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Gtk, Meta, Pango, Shell, St } = imports.gi;

 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
@ -7,7 +7,7 @@ const PermissionStore = imports.misc.permissionStore;

 const WAYLAND_KEYBINDINGS_SCHEMA = 'org.gnome.mutter.wayland.keybindings';

-const APP_WHITELIST = ['gnome-control-center.desktop'];
+const APP_ALLOWLIST = ['gnome-control-center.desktop'];
 const APP_PERMISSIONS_TABLE = 'gnome';
 const APP_PERMISSIONS_ID = 'shortcuts-inhibitor';
 const GRANTED = 'GRANTED';
@ -90,6 +90,8 @@ var InhibitShortcutsDialog = GObject.registerClass({
                text: _('You can restore shortcuts by pressing %s.').format(restoreAccel),
                style_class: 'message-dialog-description',
            });
+            restoreLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            restoreLabel.clutter_text.line_wrap = true;
            content.add_child(restoreLabel);
        }

@ -116,7 +118,7 @@ var InhibitShortcutsDialog = GObject.registerClass({
    }

    vfunc_show() {
-        if (this._app && APP_WHITELIST.includes(this._app.get_id())) {
+        if (this._app && APP_ALLOWLIST.includes(this._app.get_id())) {
            this._emitResponse(DialogResponse.ALLOW);
            return;
        }
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -42,7 +42,7 @@ const defaultKeysPost = [
    [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
     [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
     [{ label: '=/<', width: 3, level: 3, right: true }],
-     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key' }, { action: 'hide', extraClassName: 'hide-key' }]],
+     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }]],
    [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
     [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
     [{ label: '?123', width: 3, level: 2, right: true }],
@ -61,6 +61,24 @@ class AspectContainer extends St.Widget {
        this.queue_relayout();
    }

+    vfunc_get_preferred_width(forHeight) {
+        let [min, nat] = super.vfunc_get_preferred_width(forHeight);
+
+        if (forHeight > 0)
+            nat = forHeight * this._ratio;
+
+        return [min, nat];
+    }
+
+    vfunc_get_preferred_height(forWidth) {
+        let [min, nat] = super.vfunc_get_preferred_height(forWidth);
+
+        if (forWidth > 0)
+            nat = forWidth / this._ratio;
+
+        return [min, nat];
+    }
+
    vfunc_allocate(box) {
        if (box.get_width() > 0 && box.get_height() > 0) {
            let sizeRatio = box.get_width() / box.get_height();
@ -1073,8 +1091,8 @@ var Keypad = GObject.registerClass({
            { label: '8', keyval: Clutter.KEY_8, left: 1, top: 2 },
            { label: '9', keyval: Clutter.KEY_9, left: 2, top: 2 },
            { label: '0', keyval: Clutter.KEY_0, left: 1, top: 3 },
-            { label: '⌫', keyval: Clutter.KEY_BackSpace, left: 3, top: 0 },
-            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', left: 3, top: 1, height: 2 },
+            { keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic', left: 3, top: 0 },
+            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic', left: 3, top: 1, height: 2 },
        ];

        super._init({
@ -1091,7 +1109,7 @@ var Keypad = GObject.registerClass({

        for (let i = 0; i < keys.length; i++) {
            let cur = keys[i];
-            let key = new Key(cur.label || "", []);
+            let key = new Key(cur.label || "", [], cur.icon);

            if (keys[i].extraClassName)
                key.keyButton.add_style_class_name(cur.extraClassName);
@ -1608,7 +1626,9 @@ class Keyboard extends St.BoxLayout {
             * we allow the OSK being smaller than 1/3rd of the monitor height
             * there.
             */
-            this.height = Math.min(maxHeight, this.get_preferred_height(monitor.width));
+            const forWidth = this.get_theme_node().adjust_for_width(monitor.width);
+            const [, natHeight] = this.get_preferred_height(forWidth);
+            this.height = Math.min(maxHeight, natHeight);
        }
    }

--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -6,7 +6,6 @@ const Signals = imports.signals;

 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;
-const LoginManager = imports.misc.loginManager;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@ -295,18 +294,6 @@ var LayoutManager = GObject.registerClass({
        monitorManager.connect('monitors-changed',
                               this._monitorsChanged.bind(this));
        this._monitorsChanged();
-
-        // NVIDIA drivers don't preserve FBO contents across
-        // suspend/resume, see
-        // https://bugzilla.gnome.org/show_bug.cgi?id=739178
-        if (Shell.util_need_background_refresh()) {
-            LoginManager.getLoginManager().connect('prepare-for-sleep',
-                (lm, suspending) => {
-                    if (suspending)
-                        return;
-                    Meta.Background.refresh_all();
-                });
-        }
    }

    // This is called by Main after everything else is constructed
@ -470,6 +457,15 @@ var LayoutManager = GObject.registerClass({
        }
    }

+    _waitLoaded(bgManager) {
+        return new Promise(resolve => {
+            const id = bgManager.connect('loaded', () => {
+                bgManager.disconnect(id);
+                resolve();
+            });
+        });
+    }
+
    _updateBackgrounds() {
        for (let i = 0; i < this._bgManagers.length; i++)
            this._bgManagers[i].destroy();
@ -477,7 +473,7 @@ var LayoutManager = GObject.registerClass({
        this._bgManagers = [];

        if (Main.sessionMode.isGreeter)
-            return;
+            return Promise.resolve();

        for (let i = 0; i < this.monitors.length; i++) {
            let bgManager = this._createBackgroundManager(i);
@ -486,6 +482,8 @@ var LayoutManager = GObject.registerClass({
            if (i != this.primaryIndex && this._startingUp)
                bgManager.backgroundActor.hide();
        }
+
+        return Promise.all(this._bgManagers.map(this._waitLoaded));
    }

    _updateKeyboardBox() {
@ -644,7 +642,7 @@ var LayoutManager = GObject.registerClass({
    // When starting a normal user session, we want to grow it out of the middle
    // of the screen.

-    _prepareStartupAnimation() {
+    async _prepareStartupAnimation() {
        // During the initial transition, add a simple actor to block all events,
        // so they don't get delivered to X11 windows that have been transformed.
        this._coverPane = new Clutter.Actor({ opacity: 0,
@ -661,8 +659,6 @@ var LayoutManager = GObject.registerClass({
        } else if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
-            this._updateBackgrounds();
-
            // We need to force an update of the regions now before we scale
            // the UI group to get the correct allocation for the struts.
            this._updateRegions();
@ -678,6 +674,8 @@ var LayoutManager = GObject.registerClass({
            this.uiGroup.scale_x = this.uiGroup.scale_y = 0.75;
            this.uiGroup.opacity = 0;
            global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
+
+            await this._updateBackgrounds();
        }

        this.emit('startup-prepared');
@ -1204,7 +1202,8 @@ class HotCorner extends Clutter.Actor {

            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
                this._corner.set_position(this.width - this._corner.width, 0);
-                this.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
+                this.set_pivot_point(1.0, 0.0);
+                this.translation_x = -this.width;
            } else {
                this._corner.set_position(0, 0);
            }
@ -1229,8 +1228,9 @@ class HotCorner extends Clutter.Actor {
            return;

        if (Main.overview.shouldToggleByCornerOrButton()) {
-            this._ripples.playAnimation(this._x, this._y);
            Main.overview.toggle();
+            if (Main.overview.animationInProgress)
+                this._ripples.playAnimation(this._x, this._y);
        }
    }

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -489,7 +489,10 @@ var Magnifier = class Magnifier {
    _updateMouseSprite() {
        this._updateSpriteTexture();
        let [xHot, yHot] = this._cursorTracker.get_hot();
-        this._mouseSprite.set_anchor_point(xHot, yHot);
+        this._mouseSprite.set({
+            translation_x: -xHot,
+            translation_y: -yHot,
+        });
    }

    _updateSpriteTexture() {
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -3,10 +3,10 @@
            ctrlAltTabManager, padOsdService, osdWindowManager,
            osdMonitorLabeler, shellMountOpDBusService, shellDBusService,
            shellAccessDialogDBusService, shellAudioSelectionDBusService,
-            screenSaverDBus, screencastService, uiGroup, magnifier,
-            xdndHandler, keyboard, kbdA11yDialog, introspectService,
-            start, pushModal, popModal, activateWindow, createLookingGlass,
-            initializeDeferredWork, getThemeStylesheet, setThemeStylesheet */
+            screenSaverDBus, uiGroup, magnifier, xdndHandler, keyboard,
+            kbdA11yDialog, introspectService, start, pushModal, popModal,
+            activateWindow, createLookingGlass, initializeDeferredWork,
+            getThemeStylesheet, setThemeStylesheet */

 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;

@ -34,7 +34,6 @@ const LoginManager = imports.misc.loginManager;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
-const Screencast = imports.ui.screencast;
 const ScreenShield = imports.ui.screenShield;
 const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
@ -74,7 +73,6 @@ var shellAudioSelectionDBusService = null;
 var shellDBusService = null;
 var shellMountOpDBusService = null;
 var screenSaverDBus = null;
-var screencastService = null;
 var modalCount = 0;
 var actionMode = Shell.ActionMode.NONE;
 var modalActorFocusStack = [];
@ -200,7 +198,6 @@ function _initializeUI() {
    uiGroup = layoutManager.uiGroup;

    padOsdService = new PadOsd.PadOsdService();
-    screencastService = new Screencast.ScreencastService();
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
    osdWindowManager = new OsdWindow.OsdWindowManager();
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@ -4,7 +4,6 @@ const { Atk, Clutter, Gio, GLib,
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

-const Calendar = imports.ui.calendar;
 const Util = imports.misc.util;

 var MESSAGE_ANIMATION_TIME = 100;
@ -572,7 +571,6 @@ var MessageListSection = GObject.registerClass({
            Main.sessionMode.disconnect(id);
        });

-        this._date = new Date();
        this._empty = true;
        this._canClear = false;
        this._sync();
@ -598,13 +596,6 @@ var MessageListSection = GObject.registerClass({
        return true;
    }

-    setDate(date) {
-        if (Calendar.sameDay(date, this._date))
-            return;
-        this._date = date;
-        this._sync();
-    }
-
    addMessage(message, animate) {
        this.addMessageAtIndex(message, -1, animate);
    }
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported NotificationPolicy, NotificationGenericPolicy,
-   NotificationApplicationPolicy, Source, SourceActor, SourceActorWithLabel,
+   NotificationApplicationPolicy, Source, SourceActor,
   SystemNotificationSource, MessageTray */

 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
@ -655,77 +655,6 @@ class SourceActor extends St.Widget {
    }
 });

-var SourceActorWithLabel = GObject.registerClass(
-class SourceActorWithLabel extends SourceActor {
-    _init(source, size) {
-        super._init(source, size);
-
-        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
-                                            x_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER,
-                                            y_expand: true });
-
-        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel,
-                                        layout_manager: new Clutter.BinLayout() });
-        this._counterBin.hide();
-
-        this._counterBin.connect('style-changed', () => {
-            let themeNode = this._counterBin.get_theme_node();
-            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
-            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
-        });
-
-        this.add_actor(this._counterBin);
-
-        this._countUpdatedId = this._source.connect('notify::count', this._updateCount.bind(this));
-        this._updateCount();
-
-        this.connect('destroy', () => {
-            this._source.disconnect(this._countUpdatedId);
-        });
-    }
-
-    vfunc_allocate(box) {
-        super.vfunc_allocate(box);
-
-        let childBox = new Clutter.ActorBox();
-
-        let [, , naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
-        let direction = this.get_text_direction();
-
-        if (direction == Clutter.TextDirection.LTR) {
-            // allocate on the right in LTR
-            childBox.x1 = box.x2 - naturalWidth;
-            childBox.x2 = box.x2;
-        } else {
-            // allocate on the left in RTL
-            childBox.x1 = 0;
-            childBox.x2 = naturalWidth;
-        }
-
-        childBox.y1 = box.y2 - naturalHeight;
-        childBox.y2 = box.y2;
-
-        this._counterBin.allocate(childBox);
-    }
-
-    _updateCount() {
-        if (this._actorDestroyed)
-            return;
-
-        this._counterBin.visible = this._source.countVisible;
-
-        let text;
-        if (this._source.count < 100)
-            text = this._source.count.toString();
-        else
-            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
-
-        this._counterLabel.set_text(text);
-    }
-});
-
 var Source = GObject.registerClass({
    Properties: {
        'count': GObject.ParamSpec.int(
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@ -2,7 +2,6 @@
 const { Gio, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;

-const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;

@ -252,10 +251,6 @@ class MediaSection extends MessageList.MessageListSection {
                                    this._onProxyReady.bind(this));
    }

-    _shouldShow() {
-        return !this.empty && Calendar.isToday(this._date);
-    }
-
    get allowed() {
        return !Main.sessionMode.isGreeter;
    }
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -4,6 +4,10 @@
 const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;

+// Time for initial animation going into Overview mode;
+// this is defined here to make it available in imports.
+var ANIMATION_TIME = 250;
+
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
@ -14,9 +18,6 @@ const OverviewControls = imports.ui.overviewControls;
 const Params = imports.misc.params;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

-// Time for initial animation going into Overview mode
-var ANIMATION_TIME = 250;
-
 // Must be less than ANIMATION_TIME, since we switch to
 // or from the overview completely after ANIMATION_TIME,
 // and don't want the shading animation to get cut off
@ -244,11 +245,11 @@ var Overview = class {
    _unshadeBackgrounds() {
        let backgrounds = this._backgroundGroup.get_children();
        for (let i = 0; i < backgrounds.length; i++) {
-            backgrounds[i].ease_property('brightness', 1.0, {
+            backgrounds[i].ease_property('@content.brightness', 1.0, {
                duration: SHADE_ANIMATION_TIME,
                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
            });
-            backgrounds[i].ease_property('vignette-sharpness', 0.0, {
+            backgrounds[i].ease_property('@content.vignette-sharpness', 0.0, {
                duration: SHADE_ANIMATION_TIME,
                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
            });
@ -258,14 +259,16 @@ var Overview = class {
    _shadeBackgrounds() {
        let backgrounds = this._backgroundGroup.get_children();
        for (let i = 0; i < backgrounds.length; i++) {
-            backgrounds[i].ease_property('brightness', Lightbox.VIGNETTE_BRIGHTNESS, {
-                duration: SHADE_ANIMATION_TIME,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            });
-            backgrounds[i].ease_property('vignette-sharpness', Lightbox.VIGNETTE_SHARPNESS, {
-                duration: SHADE_ANIMATION_TIME,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            });
+            backgrounds[i].ease_property('@content.brightness',
+                Lightbox.VIGNETTE_BRIGHTNESS, {
+                    duration: SHADE_ANIMATION_TIME,
+                    mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+                });
+            backgrounds[i].ease_property('@content.vignette-sharpness',
+                Lightbox.VIGNETTE_SHARPNESS, {
+                    duration: SHADE_ANIMATION_TIME,
+                    mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+                });
        }
    }

@ -437,19 +440,19 @@ var Overview = class {
        this.emit('windows-restacked', stackIndices);
    }

-    beginItemDrag(_source) {
-        this.emit('item-drag-begin');
+    beginItemDrag(source) {
+        this.emit('item-drag-begin', source);
        this._inItemDrag = true;
    }

-    cancelledItemDrag(_source) {
-        this.emit('item-drag-cancelled');
+    cancelledItemDrag(source) {
+        this.emit('item-drag-cancelled', source);
    }

-    endItemDrag(_source) {
+    endItemDrag(source) {
        if (!this._inItemDrag)
            return;
-        this.emit('item-drag-end');
+        this.emit('item-drag-end', source);
        this._inItemDrag = false;
    }

@ -575,7 +578,7 @@ var Overview = class {
        this._activationTime = GLib.get_monotonic_time() / GLib.USEC_PER_SEC;

        Meta.disable_unredirect_for_display(global.display);
-        this.viewSelector.show();
+        this.viewSelector.animateToOverview();

        this._overview.opacity = 0;
        this._overview.ease({
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -8,8 +8,9 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
+const Overview = imports.ui.overview;

-var SIDE_CONTROLS_ANIMATION_TIME = 160;
+var SIDE_CONTROLS_ANIMATION_TIME = Overview.ANIMATION_TIME;

 function getRtlSlideDirection(direction, actor) {
    let rtl = actor.text_direction == Clutter.TextDirection.RTL;
@ -422,6 +423,7 @@ class ControlsManager extends St.Widget {
        let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();

        this._workspaceAdjustment = new St.Adjustment({
+            actor: this,
            value: activeWorkspaceIndex,
            lower: 0,
            page_increment: 1,
@ -453,8 +455,6 @@ class ControlsManager extends St.Widget {
        this._group.add_child(this.viewSelector);
        this._group.add_actor(this._thumbnailsSlider);

-        layout.connect('allocation-changed', this._updateWorkspacesGeometry.bind(this));
-
        Main.overview.connect('showing', this._updateSpacerVisibility.bind(this));

        this.connect('destroy', this._onDestroy.bind(this));
@ -477,26 +477,6 @@ class ControlsManager extends St.Widget {
        this._workspaceAdjustment.value = activeIndex;
    }

-    _updateWorkspacesGeometry() {
-        let [x, y] = this.get_transformed_position();
-        let [width, height] = this.get_transformed_size();
-        let geometry = { x, y, width, height };
-
-        let spacing = this.get_theme_node().get_length('spacing');
-        let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
-        let thumbnailsWidth = this._thumbnailsSlider.getNonExpandedWidth() + spacing;
-
-        geometry.width -= dashWidth;
-        geometry.width -= thumbnailsWidth;
-
-        if (this.get_text_direction() == Clutter.TextDirection.LTR)
-            geometry.x += dashWidth;
-        else
-            geometry.x += thumbnailsWidth;
-
-        this.viewSelector.setWorkspacesFullGeometry(geometry);
-    }
-
    _setVisibility() {
        // Ignore the case when we're leaving the overview, since
        // actors will be made visible again when entering the overview
--- a/js/ui/pageIndicators.js
+++ b/js/ui/pageIndicators.js
@ -120,6 +120,10 @@ var PageIndicators = GObject.registerClass({
        for (let i = 0; i < children.length; i++)
            this._updateIndicator(children[i], i);
    }
+
+    get nPages() {
+        return this._nPages;
+    }
 });

 var AnimatedPageIndicators = GObject.registerClass(
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -675,7 +675,7 @@ class PanelCorner extends St.DrawingArea {
        let borderWidth = node.get_length('-panel-corner-border-width');

        this.set_size(cornerRadius, borderWidth + cornerRadius);
-        this.set_anchor_point(0, borderWidth);
+        this.translation_y = -borderWidth;
    }
 });

@ -736,13 +736,11 @@ class AggregateMenu extends PanelMenu.Button {
        this._volume = new imports.ui.status.volume.Indicator();
        this._brightness = new imports.ui.status.brightness.Indicator();
        this._system = new imports.ui.status.system.Indicator();
-        this._screencast = new imports.ui.status.screencast.Indicator();
        this._location = new imports.ui.status.location.Indicator();
        this._nightLight = new imports.ui.status.nightLight.Indicator();
        this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();

        this._indicators.add_child(this._thunderbolt);
-        this._indicators.add_child(this._screencast);
        this._indicators.add_child(this._location);
        this._indicators.add_child(this._nightLight);
        if (this._network)
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -183,10 +183,9 @@ var Button = GObject.registerClass({
    }

    _onDestroy() {
-        super._onDestroy();
-
        if (this.menu)
            this.menu.destroy();
+        super._onDestroy();
    }
 });

--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -881,9 +881,10 @@ var PopupMenu = class extends PopupMenuBase {

        let state = event.get_state();

-        // if user has a modifier down (except capslock)
+        // if user has a modifier down (except capslock and numlock)
        // then don't handle the key press here
        state &= ~Clutter.ModifierType.LOCK_MASK;
+        state &= ~Clutter.ModifierType.MOD2_MASK;
        state &= Clutter.ModifierType.MODIFIER_MASK;

        if (state)
@ -1324,7 +1325,7 @@ var PopupMenuManager = class {

    removeMenu(menu) {
        if (menu == this.activeMenu)
-            this._closeMenu(false, menu);
+            this._grabHelper.ungrab({ actor: menu.actor });

        let position = this._findMenu(menu);
        if (position == -1) // not a menu we manage
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@ -1,146 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const { Gio, GLib, Shell } = imports.gi;
-const Signals = imports.signals;
-
-const Main = imports.ui.main;
-
-const { loadInterfaceXML } = imports.misc.fileUtils;
-
-const ScreencastIface = loadInterfaceXML('org.gnome.Shell.Screencast');
-
-var ScreencastService = class {
-    constructor() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreencastIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screencast');
-
-        Gio.DBus.session.own_name('org.gnome.Shell.Screencast', Gio.BusNameOwnerFlags.REPLACE, null, null);
-
-        this._recorders = new Map();
-
-        this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
-
-        Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
-    }
-
-    get isRecording() {
-        return this._recorders.size > 0;
-    }
-
-    _ensureRecorderForSender(sender) {
-        let recorder = this._recorders.get(sender);
-        if (!recorder) {
-            recorder = new Shell.Recorder({ stage: global.stage,
-                                            display: global.display });
-            recorder._watchNameId =
-                Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
-                                   this._onNameVanished.bind(this));
-            this._recorders.set(sender, recorder);
-            this.emit('updated');
-        }
-        return recorder;
-    }
-
-    _sessionUpdated() {
-        if (Main.sessionMode.allowScreencast)
-            return;
-
-        for (let sender of this._recorders.keys())
-            this._stopRecordingForSender(sender);
-    }
-
-    _onNameVanished(connection, name) {
-        this._stopRecordingForSender(name);
-    }
-
-    _stopRecordingForSender(sender) {
-        let recorder = this._recorders.get(sender);
-        if (!recorder)
-            return false;
-
-        Gio.bus_unwatch_name(recorder._watchNameId);
-        recorder.close();
-        this._recorders.delete(sender);
-        this.emit('updated');
-
-        return true;
-    }
-
-    _applyOptionalParameters(recorder, options) {
-        for (let option in options)
-            options[option] = options[option].deep_unpack();
-
-        if (options['pipeline'])
-            recorder.set_pipeline(options['pipeline']);
-        if (options['framerate'])
-            recorder.set_framerate(options['framerate']);
-        if ('draw-cursor' in options)
-            recorder.set_draw_cursor(options['draw-cursor']);
-    }
-
-    ScreencastAsync(params, invocation) {
-        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast ||
-            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        let sender = invocation.get_sender();
-        let recorder = this._ensureRecorderForSender(sender);
-        if (!recorder.is_recording()) {
-            let [fileTemplate, options] = params;
-
-            recorder.set_file_template(fileTemplate);
-            this._applyOptionalParameters(recorder, options);
-            let [success, fileName] = recorder.record();
-            returnValue = [success, fileName ? fileName : ''];
-            if (!success)
-                this._stopRecordingForSender(sender);
-        }
-
-        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-    }
-
-    ScreencastAreaAsync(params, invocation) {
-        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast ||
-            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        let sender = invocation.get_sender();
-        let recorder = this._ensureRecorderForSender(sender);
-
-        if (!recorder.is_recording()) {
-            let [x, y, width, height, fileTemplate, options] = params;
-
-            if (x < 0 || y < 0 ||
-                width <= 0 || height <= 0 ||
-                x + width > global.screen_width ||
-                y + height > global.screen_height) {
-                invocation.return_error_literal(Gio.IOErrorEnum,
-                                                Gio.IOErrorEnum.CANCELLED,
-                                                "Invalid params");
-                return;
-            }
-
-            recorder.set_file_template(fileTemplate);
-            recorder.set_area(x, y, width, height);
-            this._applyOptionalParameters(recorder, options);
-            let [success, fileName] = recorder.record();
-            returnValue = [success, fileName ? fileName : ''];
-            if (!success)
-                this._stopRecordingForSender(sender);
-        }
-
-        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-    }
-
-    StopScreencastAsync(params, invocation) {
-        let success = this._stopRecordingForSender(invocation.get_sender());
-        invocation.return_value(GLib.Variant.new('(b)', [success]));
-    }
-};
-Signals.addSignalMethods(ScreencastService.prototype);
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -21,16 +21,13 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
 // When scripting an automated test we want to make a series of calls
 // in a linear fashion, but we also want to be able to let the main
 // loop run so actions can finish. For this reason we write the script
-// as a generator function that yields when it want to let the main
+// as an async function that uses await when it wants to let the main
 // loop run.
 //
-//    yield Scripting.sleep(1000);
+//    await Scripting.sleep(1000);
 //    main.overview.show();
-//    yield Scripting.waitLeisure();
+//    await Scripting.waitLeisure();
 //
-// While it isn't important to the person writing the script, the actual
-// yielded result is a function that the caller uses to provide the
-// callback for resuming the script.

 /**
 * sleep:
@ -285,13 +282,11 @@ function _collect(scriptModule, outputFile) {
 }

 async function _runPerfScript(scriptModule, outputFile) {
-    for (let step of scriptModule.run()) {
-        try {
-            await step; // eslint-disable-line no-await-in-loop
-        } catch (err) {
-            log(`Script failed: ${err}\n${err.stack}`);
-            Meta.exit(Meta.ExitCode.ERROR);
-        }
+    try {
+        await scriptModule.run();
+    } catch (err) {
+        log(`Script failed: ${err}\n${err.stack}`);
+        Meta.exit(Meta.ExitCode.ERROR);
    }

    try {
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -113,10 +113,10 @@ function _loadMode(file, info) {
    }

    _modes[modeName] = {};
-    let propBlacklist = ['unlockDialog'];
+    const  excludedProps = ['unlockDialog'];
    for (let prop in _modes[DEFAULT_MODE]) {
        if (newMode[prop] !== undefined &&
-            !propBlacklist.includes(prop))
+            !excludedProps.includes(prop))
            _modes[modeName][prop] = newMode[prop];
    }
    _modes[modeName]['isPrimary'] = true;
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@ -225,10 +225,6 @@ class Indicator extends PanelMenu.SystemIndicator {
    }
 });

-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 var AppAuthorizer = class {
    constructor(desktopId, reqAccuracyLevel, permStoreProxy, maxAccuracyLevel) {
        this.desktopId = desktopId;
@ -313,9 +309,8 @@ var AppAuthorizer = class {

    _completeAuth() {
        if (this._accuracyLevel != GeoclueAccuracyLevel.NONE) {
-            this._accuracyLevel = clamp(this._accuracyLevel,
-                                        0,
-                                        this._maxAccuracyLevel);
+            this._accuracyLevel = Math.clamp(this._accuracyLevel,
+                0, this._maxAccuracyLevel);
        }
        this._saveToPermissionStore();

--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -15,6 +15,7 @@ const Util = imports.misc.util;

 const { loadInterfaceXML } = imports.misc.fileUtils;

+Gio._promisify(Gio.DBusConnection.prototype, 'call', 'call_finish');
 Gio._promisify(NM.Client, 'new_async', 'new_finish');
 Gio._promisify(NM.Client.prototype,
    'check_connectivity_async', 'check_connectivity_finish');
@ -82,6 +83,30 @@ function ensureActiveConnectionProps(active) {
    }
 }

+function launchSettingsPanel(panel, ...args) {
+    const param = new GLib.Variant('(sav)',
+        [panel, args.map(s => new GLib.Variant('s', s))]);
+    const platformData = {
+        'desktop-startup-id': new GLib.Variant('s',
+            '_TIME%s'.format(global.get_current_time())),
+    };
+    try {
+        Gio.DBus.session.call(
+            'org.gnome.ControlCenter',
+            '/org/gnome/ControlCenter',
+            'org.freedesktop.Application',
+            'ActivateAction',
+            new GLib.Variant('(sava{sv})',
+                ['launch-panel', [param], platformData]),
+            null,
+            Gio.DBusCallFlags.NONE,
+            -1,
+            null);
+    } catch (e) {
+        log('Failed to launch Settings panel: %s'.format(e.message));
+    }
+}
+
 var NMConnectionItem = class {
    constructor(section, connection) {
        this._section = section;
@ -539,8 +564,7 @@ var NMDeviceModem = class extends NMConnectionDevice {
    }

    _autoConnect() {
-        Util.spawn(['gnome-control-center', 'network',
-                    'connect-3g', this._device.get_path()]);
+        launchSettingsPanel('network', 'connect-3g', this._device.get_path());
    }

    destroy() {
@ -931,8 +955,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
                (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                // 802.1x-enabled APs require further configuration, so they're
                // handled in gnome-control-center
-                Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
-                            this._device.get_path(), accessPoints[0].get_path()]);
+                launchSettingsPanel('wifi', 'connect-8021x-wifi',
+                    this._device.get_path(), accessPoints[0].get_path());
            } else {
                let connection = new NM.SimpleConnection();
                this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);
--- a/js/ui/status/remoteAccess.js
+++ b/js/ui/status/remoteAccess.js
@ -24,7 +24,8 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
            return;

        this._handles = new Set();
-        this._indicator = null;
+        this._sharedIndicator = null;
+        this._recordingIndicator = null;
        this._menuSection = null;

        controller.connect('new-handle', (o, handle) => {
@ -33,32 +34,49 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
    }

    _ensureControls() {
-        if (this._indicator)
+        if (this._sharedIndicator && this._recordingIndicator)
            return;

-        this._indicator = this._addIndicator();
-        this._indicator.icon_name = 'screen-shared-symbolic';
-        this._indicator.add_style_class_name('remote-access-indicator');
-        this._item =
+        this._sharedIndicator = this._addIndicator();
+        this._sharedIndicator.icon_name = 'screen-shared-symbolic';
+        this._sharedIndicator.add_style_class_name('remote-access-indicator');
+
+        this._sharedItem =
            new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"),
                                               true);
-        this._item.menu.addAction(_("Turn off"),
-                                  () => {
-                                      for (let handle of this._handles)
-                                          handle.stop();
-                                  });
-        this._item.icon.icon_name = 'screen-shared-symbolic';
-        this.menu.addMenuItem(this._item);
+        this._sharedItem.menu.addAction(_("Turn off"),
+            () => {
+                for (let handle of this._handles) {
+                    if (!handle.is_recording)
+                        handle.stop();
+                }
+            });
+        this._sharedItem.icon.icon_name = 'screen-shared-symbolic';
+        this.menu.addMenuItem(this._sharedItem);
+
+        this._recordingIndicator = this._addIndicator();
+        this._recordingIndicator.icon_name = 'media-record-symbolic';
+        this._recordingIndicator.add_style_class_name('screencast-indicator');
+    }
+
+    _isScreenShared() {
+        return [...this._handles].some(handle => !handle.is_recording);
+    }
+
+    _isRecording() {
+        return [...this._handles].some(handle => handle.is_recording);
    }

    _sync() {
-        if (this._handles.size == 0) {
-            this._indicator.visible = false;
-            this._item.visible = false;
+        if (this._isScreenShared()) {
+            this._sharedIndicator.visible = true;
+            this._sharedItem.visible = true;
        } else {
-            this._indicator.visible = true;
-            this._item.visible = true;
+            this._sharedIndicator.visible = false;
+            this._sharedItem.visible = false;
        }
+
+        this._recordingIndicator.visible = this._isRecording();
    }

    _onStopped(handle) {
@ -70,9 +88,7 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
        this._handles.add(handle);
        handle.connect('stopped', this._onStopped.bind(this));

-        if (this._handles.size == 1) {
-            this._ensureControls();
-            this._sync();
-        }
+        this._ensureControls();
+        this._sync();
    }
 });
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@ -86,6 +86,8 @@ class Indicator extends PanelMenu.SystemIndicator {

        Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
        this._sessionUpdated();
+
+        this._sync();
    }

    _sessionUpdated() {
--- a/js/ui/status/screencast.js
+++ b/js/ui/status/screencast.js
@ -1,25 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported Indicator */
-
-const GObject = imports.gi.GObject;
-
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-
-var Indicator = GObject.registerClass(
-class Indicator extends PanelMenu.SystemIndicator {
-    _init() {
-        super._init();
-
-        this._indicator = this._addIndicator();
-        this._indicator.icon_name = 'media-record-symbolic';
-        this._indicator.add_style_class_name('screencast-indicator');
-        this._sync();
-
-        Main.screencastService.connect('updated', this._sync.bind(this));
-    }
-
-    _sync() {
-        this._indicator.visible = Main.screencastService.isRecording;
-    }
-});
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -27,6 +27,8 @@ class Indicator extends PanelMenu.SystemIndicator {
            () => this._updateSessionSubMenu());
        this._powerOffItem.connect('notify::visible',
            () => this._updateSessionSubMenu());
+        this._restartItem.connect('notify::visible',
+            () => this._updateSessionSubMenu());
        // Whether shutdown is available or not depends on both lockdown
        // settings (disable-log-out) and Polkit policy - the latter doesn't
        // notify, so we update the menu item each time the menu opens or
@ -52,6 +54,7 @@ class Indicator extends PanelMenu.SystemIndicator {
            this._loginScreenItem.visible ||
            this._logoutItem.visible ||
            this._suspendItem.visible ||
+            this._restartItem.visible ||
            this._powerOffItem.visible;
    }

@ -70,9 +73,8 @@ class Indicator extends PanelMenu.SystemIndicator {
        this.menu.addMenuItem(item);
        this._orientationLockItem = item;
        this._systemActions.bind_property('can-lock-orientation',
-                                          this._orientationLockItem,
-                                          'visible',
-                                          bindFlags);
+            this._orientationLockItem, 'visible',
+            bindFlags);
        this._systemActions.connect('notify::orientation-lock-icon', () => {
            let iconName = this._systemActions.orientation_lock_icon;
            let labelText = this._systemActions.getName("lock-orientation");
@ -84,8 +86,8 @@ class Indicator extends PanelMenu.SystemIndicator {
        let app = this._settingsApp = Shell.AppSystem.get_default().lookup_app(
            'gnome-control-center.desktop');
        if (app) {
-            let [icon, name] = [app.app_info.get_icon().names[0],
-                                app.get_name()];
+            const [icon] = app.app_info.get_icon().names;
+            const name = app.app_info.get_name();
            item = new PopupMenu.PopupImageMenuItem(name, icon);
            item.connect('activate', () => {
                this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
@ -107,41 +109,14 @@ class Indicator extends PanelMenu.SystemIndicator {
        this.menu.addMenuItem(item);
        this._lockScreenItem = item;
        this._systemActions.bind_property('can-lock-screen',
-                                          this._lockScreenItem,
-                                          'visible',
-                                          bindFlags);
+            this._lockScreenItem, 'visible',
+            bindFlags);

        this._sessionSubMenu = new PopupMenu.PopupSubMenuMenuItem(
            _('Power Off / Log Out'), true);
        this._sessionSubMenu.icon.icon_name = 'system-shutdown-symbolic';

-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
-        item.connect('activate', () => {
-            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateLogout();
-        });
-        this._sessionSubMenu.menu.addMenuItem(item);
-        this._logoutItem = item;
-        this._systemActions.bind_property('can-logout',
-                                          this._logoutItem,
-                                          'visible',
-                                          bindFlags);
-
-        item = new PopupMenu.PopupMenuItem(_("Switch User…"));
-        item.connect('activate', () => {
-            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateSwitchUser();
-        });
-        this._sessionSubMenu.menu.addMenuItem(item);
-        this._loginScreenItem = item;
-        this._systemActions.bind_property('can-switch-user',
-                                          this._loginScreenItem,
-                                          'visible',
-                                          bindFlags);
-
-        this._sessionSubMenu.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item = new PopupMenu.PopupMenuItem(_('Suspend'));
        item.connect('activate', () => {
            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
            this._systemActions.activateSuspend();
@ -149,11 +124,21 @@ class Indicator extends PanelMenu.SystemIndicator {
        this._sessionSubMenu.menu.addMenuItem(item);
        this._suspendItem = item;
        this._systemActions.bind_property('can-suspend',
-                                          this._suspendItem,
-                                          'visible',
-                                          bindFlags);
+            this._suspendItem, 'visible',
+            bindFlags);

-        item = new PopupMenu.PopupMenuItem(_("Power Off…"));
+        item = new PopupMenu.PopupMenuItem(_('Restart…'));
+        item.connect('activate', () => {
+            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+            this._systemActions.activateRestart();
+        });
+        this._sessionSubMenu.menu.addMenuItem(item);
+        this._restartItem = item;
+        this._systemActions.bind_property('can-restart',
+            this._restartItem, 'visible',
+            bindFlags);
+
+        item = new PopupMenu.PopupMenuItem(_('Power Off…'));
        item.connect('activate', () => {
            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
            this._systemActions.activatePowerOff();
@ -161,9 +146,32 @@ class Indicator extends PanelMenu.SystemIndicator {
        this._sessionSubMenu.menu.addMenuItem(item);
        this._powerOffItem = item;
        this._systemActions.bind_property('can-power-off',
-                                          this._powerOffItem,
-                                          'visible',
-                                          bindFlags);
+            this._powerOffItem, 'visible',
+            bindFlags);
+
+        this._sessionSubMenu.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        item = new PopupMenu.PopupMenuItem(_('Log Out'));
+        item.connect('activate', () => {
+            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+            this._systemActions.activateLogout();
+        });
+        this._sessionSubMenu.menu.addMenuItem(item);
+        this._logoutItem = item;
+        this._systemActions.bind_property('can-logout',
+            this._logoutItem, 'visible',
+            bindFlags);
+
+        item = new PopupMenu.PopupMenuItem(_('Switch User…'));
+        item.connect('activate', () => {
+            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+            this._systemActions.activateSwitchUser();
+        });
+        this._sessionSubMenu.menu.addMenuItem(item);
+        this._loginScreenItem = item;
+        this._systemActions.bind_property('can-switch-user',
+            this._loginScreenItem, 'visible',
+            bindFlags);

        this.menu.addMenuItem(this._sessionSubMenu);
    }
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -62,6 +62,7 @@ var StreamSlider = class {

        this._stream = null;
        this._volumeCancellable = null;
+        this._icons = [];
    }

    get stream() {
@ -182,24 +183,15 @@ var StreamSlider = class {
        if (!this._stream)
            return null;

-        let icons = ["audio-volume-muted-symbolic",
-                     "audio-volume-low-symbolic",
-                     "audio-volume-medium-symbolic",
-                     "audio-volume-high-symbolic",
-                     "audio-volume-overamplified-symbolic"];
-
        let volume = this._stream.volume;
        let n;
        if (this._stream.is_muted || volume <= 0) {
            n = 0;
        } else {
            n = Math.ceil(3 * volume / this._control.get_vol_max_norm());
-            if (n < 1)
-                n = 1;
-            else if (n > 3)
-                n = 4;
+            n = Math.clamp(n, 1, this._icons.length - 1);
        }
-        return icons[n];
+        return this._icons[n];
    }

    getLevel() {
@ -223,6 +215,13 @@ var OutputStreamSlider = class extends StreamSlider {
    constructor(control) {
        super(control);
        this._slider.accessible_name = _("Volume");
+        this._icons = [
+            'audio-volume-muted-symbolic',
+            'audio-volume-low-symbolic',
+            'audio-volume-medium-symbolic',
+            'audio-volume-high-symbolic',
+            'audio-volume-overamplified-symbolic',
+        ];
    }

    _connectStream(stream) {
@ -274,6 +273,12 @@ var InputStreamSlider = class extends StreamSlider {
        this._control.connect('stream-added', this._maybeShowInput.bind(this));
        this._control.connect('stream-removed', this._maybeShowInput.bind(this));
        this._icon.icon_name = 'audio-input-microphone-symbolic';
+        this._icons = [
+            'microphone-sensitivity-muted-symbolic',
+            'microphone-sensitivity-low-symbolic',
+            'microphone-sensitivity-medium-symbolic',
+            'microphone-sensitivity-high-symbolic',
+        ];
    }

    _connectStream(stream) {
@ -319,7 +324,7 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {

        this._output = new OutputStreamSlider(this._control);
        this._output.connect('stream-updated', () => {
-            this.emit('icon-changed');
+            this.emit('output-icon-changed');
        });
        this.addMenuItem(this._output.item);

@ -327,6 +332,9 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
        this._input.item.connect('notify::visible', () => {
            this.emit('input-visible-changed');
        });
+        this._input.connect('stream-updated', () => {
+            this.emit('input-icon-changed');
+        });
        this.addMenuItem(this._input.item);

        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@ -343,7 +351,7 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
            this._readInput();
            this._readOutput();
        } else {
-            this.emit('icon-changed');
+            this.emit('output-icon-changed');
        }
    }

@ -355,10 +363,14 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
        this._input.stream = this._control.get_default_source();
    }

-    getIcon() {
+    getOutputIcon() {
        return this._output.getIcon();
    }

+    getInputIcon() {
+        return this._input.getIcon();
+    }
+
    getLevel() {
        return this._output.getLevel();
    }
@ -382,21 +394,24 @@ class Indicator extends PanelMenu.SystemIndicator {

        this._control = getMixerControl();
        this._volumeMenu = new VolumeMenu(this._control);
-        this._volumeMenu.connect('icon-changed', () => {
-            let icon = this._volumeMenu.getIcon();
+        this._volumeMenu.connect('output-icon-changed', () => {
+            let icon = this._volumeMenu.getOutputIcon();

            if (icon != null)
                this._primaryIndicator.icon_name = icon;
            this._primaryIndicator.visible = icon !== null;
        });

-        this._inputIndicator.set({
-            icon_name: 'audio-input-microphone-symbolic',
-            visible: this._volumeMenu.getInputVisible(),
-        });
+        this._inputIndicator.visible = this._volumeMenu.getInputVisible();
        this._volumeMenu.connect('input-visible-changed', () => {
            this._inputIndicator.visible = this._volumeMenu.getInputVisible();
        });
+        this._volumeMenu.connect('input-icon-changed', () => {
+            let icon = this._volumeMenu.getInputIcon();
+
+            if (icon !== null)
+                this._inputIndicator.icon_name = icon;
+        });

        this.menu.addMenuItem(this._volumeMenu);
    }
@ -406,7 +421,7 @@ class Indicator extends PanelMenu.SystemIndicator {
        if (result == Clutter.EVENT_PROPAGATE || this.menu.actor.mapped)
            return result;

-        let gicon = new Gio.ThemedIcon({ name: this._volumeMenu.getIcon() });
+        let gicon = new Gio.ThemedIcon({ name: this._volumeMenu.getOutputIcon() });
        let level = this._volumeMenu.getLevel();
        let maxLevel = this._volumeMenu.getMaxLevel();
        Main.osdWindowManager.show(-1, gicon, null, level, maxLevel);
--- a/js/ui/swipeTracker.js
+++ b/js/ui/swipeTracker.js
@ -28,10 +28,6 @@ const State = {
    SCROLLING: 1,
 };

-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 const TouchpadSwipeGesture = GObject.registerClass({
    Properties: {
        'enabled': GObject.ParamSpec.boolean(
@ -558,8 +554,8 @@ var SwipeTracker = GObject.registerClass({

        let firstPoint = this._snapPoints[0];
        let lastPoint = this._snapPoints[this._snapPoints.length - 1];
-        this._progress = clamp(this._progress, firstPoint, lastPoint);
-        this._progress = clamp(this._progress,
+        this._progress = Math.clamp(this._progress, firstPoint, lastPoint);
+        this._progress = Math.clamp(this._progress,
            this._initialProgress - 1, this._initialProgress + 1);

        this.emit('update', this._progress);
@ -606,7 +602,7 @@ var SwipeTracker = GObject.registerClass({

        let duration = Math.abs((this._progress - endProgress) / velocity * DURATION_MULTIPLIER);
        if (duration > 0) {
-            duration = clamp(duration,
+            duration = Math.clamp(duration,
                MIN_ANIMATION_DURATION, MAX_ANIMATION_DURATION);
        }

--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -485,6 +485,7 @@ var UnlockDialog = GObject.registerClass({
        this._gdmClient = new Gdm.Client();

        this._adjustment = new St.Adjustment({
+            actor: this,
            lower: 0,
            upper: 2,
            page_size: 1,
@ -524,6 +525,10 @@ var UnlockDialog = GObject.registerClass({

        this._bgManagers = [];

+        const themeContext = St.ThemeContext.get_for_stage(global.stage);
+        this._scaleChangedId = themeContext.connect('notify::scale-factor',
+            () => this._updateBackgroundEffects());
+
        this._updateBackgrounds();
        this._monitorsChangedId =
            Main.layoutManager.connect('monitors-changed', this._updateBackgrounds.bind(this));
@ -566,9 +571,15 @@ var UnlockDialog = GObject.registerClass({
        this._otherUserButton.set_pivot_point(0.5, 0.5);
        this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this));

-        let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
-        screenSaverSettings.bind('user-switch-enabled',
-            this._otherUserButton, 'visible', Gio.SettingsBindFlags.GET);
+        this._screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
+
+        this._userSwitchEnabledId = this._screenSaverSettings.connect('changed::user-switch-enabled',
+            this._updateUserSwitchVisibility.bind(this));
+
+        this._userLoadedId = this._user.connect('notify::is-loaded',
+            this._updateUserSwitchVisibility.bind(this));
+
+        this._updateUserSwitchVisibility();

        // Main Box
        let mainBox = new St.Widget();
@ -618,6 +629,7 @@ var UnlockDialog = GObject.registerClass({
            y: monitor.y,
            width: monitor.width,
            height: monitor.height,
+            effect: new Shell.BlurEffect({ name: 'blur' }),
        });

        let bgManager = new Background.BackgroundManager({
@ -629,19 +641,17 @@ var UnlockDialog = GObject.registerClass({
        this._bgManagers.push(bgManager);

        this._backgroundGroup.add_child(widget);
+    }

+    _updateBackgroundEffects() {
        const themeContext = St.ThemeContext.get_for_stage(global.stage);

-        let effect = new Shell.BlurEffect({
-            brightness: BLUR_BRIGHTNESS,
-            sigma: BLUR_SIGMA * themeContext.scale_factor,
-        });
-
-        this._scaleChangedId = themeContext.connect('notify::scale-factor', () => {
-            effect.sigma = BLUR_SIGMA * themeContext.scale_factor;
-        });
-
-        widget.add_effect(effect);
+        for (const widget of this._backgroundGroup) {
+            widget.get_effect('blur').set({
+                brightness: BLUR_BRIGHTNESS,
+                sigma: BLUR_SIGMA * themeContext.scale_factor,
+            });
+        }
    }

    _updateBackgrounds() {
@ -653,6 +663,7 @@ var UnlockDialog = GObject.registerClass({

        for (let i = 0; i < Main.layoutManager.monitors.length; i++)
            this._createBackground(i);
+        this._updateBackgroundEffects();
    }

    _ensureAuthPrompt() {
@ -828,6 +839,21 @@ var UnlockDialog = GObject.registerClass({
            this._gdmClient = null;
            delete this._gdmClient;
        }
+
+        if (this._userLoadedId) {
+            this._user.disconnect(this._userLoadedId);
+            this._userLoadedId = 0;
+        }
+
+        if (this._userSwitchEnabledId) {
+            this._screenSaverSettings.disconnect(this._userSwitchEnabledId);
+            this._userSwitchEnabledId = 0;
+        }
+    }
+
+    _updateUserSwitchVisibility() {
+        this._otherUserButton.visible = this._userManager.can_switch() &&
+            this._screenSaverSettings.get_boolean('user-switch-enabled');
    }

    cancel() {
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -132,6 +132,7 @@ var ViewSelector = GObject.registerClass({
        super._init({
            name: 'viewSelector',
            x_expand: true,
+            visible: false,
        });

        this._showAppsButton = showAppsButton;
@ -271,9 +272,10 @@ var ViewSelector = GObject.registerClass({
        Main.overview.show();
    }

-    show() {
+    animateToOverview() {
+        this.show();
        this.reset();
-        this._workspacesDisplay.show(this._showAppsButton.checked);
+        this._workspacesDisplay.animateToOverview(this._showAppsButton.checked);
        this._activePage = null;
        if (this._showAppsButton.checked)
            this._showPage(this._appsPage);
@ -297,13 +299,11 @@ var ViewSelector = GObject.registerClass({
            Main.overview.fadeInDesktop();
    }

-    setWorkspacesFullGeometry(geom) {
-        this._workspacesDisplay.setWorkspacesFullGeometry(geom);
-    }
-
-    hide() {
+    vfunc_hide() {
        this.reset();
        this._workspacesDisplay.hide();
+
+        super.vfunc_hide();
    }

    _addPage(actor, name, a11yIcon, params) {
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -42,6 +42,11 @@ const GsdWacomProxy = Gio.DBusProxy.makeProxyWrapper(GsdWacomIface);

 const WINDOW_DIMMER_EFFECT_NAME = "gnome-shell-window-dimmer";

+Gio._promisify(Shell,
+    'util_start_systemd_unit', 'util_start_systemd_unit_finish');
+Gio._promisify(Shell,
+    'util_stop_systemd_unit', 'util_stop_systemd_unit_finish');
+
 var DisplayChangeDialog = GObject.registerClass(
 class DisplayChangeDialog extends ModalDialog.ModalDialog {
    _init(wm) {
@ -901,46 +906,23 @@ var WindowManager = class {
        global.display.connect('init-xserver', (display, task) => {
            IBusManager.getIBusManager().restartDaemon(['--xim']);

-            try {
-                if (!Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail'))
-                    log('Not starting gsd-xsettings; waiting for gnome-session to do so');
+            /* Timeout waiting for start job completion after 5 seconds */
+            let cancellable = new Gio.Cancellable();
+            GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
+                cancellable.cancel();
+                return GLib.SOURCE_REMOVE;
+            });

-                /* Leave this watchdog timeout so don't block indefinitely here */
-                let timeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
-                    Gio.DBus.session.unwatch_name(watchId);
-                    log('Warning: Failed to start gsd-xsettings');
-                    task.return_boolean(true);
-                    timeoutId = 0;
-                    return GLib.SOURCE_REMOVE;
-                });
-
-                /* When gsd-xsettings daemon is started, we are good to resume */
-                let watchId = Gio.DBus.session.watch_name(
-                    'org.gnome.SettingsDaemon.XSettings',
-                    Gio.BusNameWatcherFlags.NONE,
-                    () => {
-                        Gio.DBus.session.unwatch_name(watchId);
-                        if (timeoutId > 0) {
-                            task.return_boolean(true);
-                            GLib.source_remove(timeoutId);
-                        }
-                    },
-                    null);
-            } catch (e) {
-                log('Error starting gsd-xsettings: %s'.format(e.message));
-                task.return_boolean(true);
-            }
+            this._startX11Services(task, cancellable);

            return true;
        });
        global.display.connect('x11-display-closing', () => {
            if (!Meta.is_wayland_compositor())
                return;
-            try {
-                Shell.util_stop_systemd_unit('gsd-xsettings.target', 'fail');
-            } catch (e) {
-                log('Error stopping gsd-xsettings: %s'.format(e.message));
-            }
+
+            this._stopX11Services(null);
+
            IBusManager.getIBusManager().restartDaemon();
        });

@ -1008,6 +990,36 @@ var WindowManager = class {
        global.stage.add_action(topDragAction);
    }

+    async _startX11Services(task, cancellable) {
+        try {
+            await Shell.util_start_systemd_unit(
+                'gnome-session-x11-services-ready.target', 'fail', cancellable);
+        } catch (e) {
+            // Ignore NOT_SUPPORTED error, which indicates we are not systemd
+            // managed and gnome-session will have taken care of everything
+            // already.
+            // Note that we do log cancellation from here.
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
+                log('Error starting X11 services: %s'.format(e.message));
+        } finally {
+            task.return_boolean(true);
+        }
+    }
+
+    async _stopX11Services(cancellable) {
+        try {
+            await Shell.util_stop_systemd_unit(
+                'gnome-session-x11-services.target', 'fail', cancellable);
+        } catch (e) {
+            // Ignore NOT_SUPPORTED error, which indicates we are not systemd
+            // managed and gnome-session will have taken care of everything
+            // already.
+            // Note that we do log cancellation from here.
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
+                log('Error stopping X11 services: %s'.format(e.message));
+        }
+    }
+
    _showPadOsd(display, device, settings, imagePath, editionMode, monitorIndex) {
        this._currentPadOsd = new PadOsd.PadOsd(device, settings, imagePath, editionMode, monitorIndex);
        this._currentPadOsd.connect('closed', () => (this._currentPadOsd = null));
@ -1278,13 +1290,13 @@ var WindowManager = class {
    }

    _sizeChangeWindow(shellwm, actor, whichChange, oldFrameRect, _oldBufferRect) {
-        let types = [Meta.WindowType.NORMAL];
-        if (!this._shouldAnimateActor(actor, types)) {
-            shellwm.completed_size_change(actor);
-            return;
-        }
+        const types = [Meta.WindowType.NORMAL];
+        const shouldAnimate =
+            this._shouldAnimateActor(actor, types) &&
+            oldFrameRect.width > 0 &&
+            oldFrameRect.height > 0;

-        if (oldFrameRect.width > 0 && oldFrameRect.height > 0)
+        if (shouldAnimate)
            this._prepareAnimationInfo(shellwm, actor, oldFrameRect, whichChange);
        else
            shellwm.completed_size_change(actor);
@ -1299,17 +1311,24 @@ var WindowManager = class {
        actorClone.set_position(oldFrameRect.x, oldFrameRect.y);
        actorClone.set_size(oldFrameRect.width, oldFrameRect.height);

-        if (this._clearAnimationInfo(actor))
+        actor.freeze();
+
+        if (this._clearAnimationInfo(actor)) {
+            log('Old animationInfo removed from actor %s'.format(actor));
            this._shellwm.completed_size_change(actor);
+        }

        let destroyId = actor.connect('destroy', () => {
            this._clearAnimationInfo(actor);
        });

        this._resizePending.add(actor);
-        actor.__animationInfo = { clone: actorClone,
-                                  oldRect: oldFrameRect,
-                                  destroyId };
+        actor.__animationInfo = {
+            clone: actorClone,
+            oldRect: oldFrameRect,
+            frozen: true,
+            destroyId,
+        };
    }

    _sizeChangedWindow(shellwm, actor) {
@ -1362,13 +1381,17 @@ var WindowManager = class {
        // Now unfreeze actor updates, to get it to the new size.
        // It's important that we don't wait until the animation is completed to
        // do this, otherwise our scale will be applied to the old texture size.
-        shellwm.completed_size_change(actor);
+        actor.thaw();
+        actor.__animationInfo.frozen = false;
    }

    _clearAnimationInfo(actor) {
        if (actor.__animationInfo) {
            actor.__animationInfo.clone.destroy();
            actor.disconnect(actor.__animationInfo.destroyId);
+            if (actor.__animationInfo.frozen)
+                actor.thaw();
+
            delete actor.__animationInfo;
            return true;
        }
@ -1383,10 +1406,13 @@ var WindowManager = class {
            actor.translation_x = 0;
            actor.translation_y = 0;
            this._clearAnimationInfo(actor);
+            this._shellwm.completed_size_change(actor);
        }

-        if (this._resizePending.delete(actor))
+        if (this._resizePending.delete(actor)) {
+            this._clearAnimationInfo(actor);
            this._shellwm.completed_size_change(actor);
+        }
    }

    _hasAttachedDialogs(window, ignoreWindow) {
@ -1786,8 +1812,7 @@ var WindowManager = class {
            w.window.get_parent().remove_child(w.window);
            w.parent.add_child(w.window);

-            if (w.window.get_meta_window().get_workspace() !=
-                global.workspace_manager.get_active_workspace())
+            if (!w.window.get_meta_window().get_workspace().active)
                w.window.hide();
        }
        switchData.container.destroy();
@ -1971,7 +1996,7 @@ var WindowManager = class {
            duration,
            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
            onComplete: () => {
-                if (newWs !== activeWorkspace)
+                if (!newWs.active)
                    this.actionMoveWorkspace(newWs);
                this._finishWorkspaceSwitch(switchData);
            },
@ -2101,8 +2126,16 @@ var WindowManager = class {
            newWs = workspaceManager.get_workspace_by_index(workspaceManager.n_workspaces - 1);
        } else if (isNaN(target)) {
            // Prepend a new workspace dynamically
-            if (workspaceManager.get_active_workspace_index() == 0 &&
-                action == 'move' && target == 'up' && this._isWorkspacePrepended == false) {
+            let prependTarget;
+            if (vertical)
+                prependTarget = 'up';
+            else if (rtl)
+                prependTarget = 'right';
+            else
+                prependTarget = 'left';
+            if (workspaceManager.get_active_workspace_index() === 0 &&
+                action === 'move' && target === prependTarget &&
+                this._isWorkspacePrepended === false) {
                this.insertWorkspace(0);
                this._isWorkspacePrepended = true;
            }
@ -2163,10 +2196,7 @@ var WindowManager = class {
        if (!Main.sessionMode.hasWorkspaces)
            return;

-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-
-        if (activeWorkspace != workspace)
+        if (!workspace.active)
            workspace.activate(global.get_current_time());
    }

@ -2174,10 +2204,7 @@ var WindowManager = class {
        if (!Main.sessionMode.hasWorkspaces)
            return;

-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-
-        if (activeWorkspace != workspace) {
+        if (!workspace.active) {
            // This won't have any effect for "always sticky" windows
            // (like desktop windows or docks)

--- a/js/ui/windowPreview.js
+++ b/js/ui/windowPreview.js
@ -0,0 +1,771 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported WindowPreview */
+
+const { Atk, Clutter, GLib, GObject,
+        Graphene, Meta, Pango, Shell, St } = imports.gi;
+
+const DND = imports.ui.dnd;
+
+var WINDOW_DND_SIZE = 256;
+
+var WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT = 750;
+var WINDOW_OVERLAY_FADE_TIME = 200;
+
+var DRAGGING_WINDOW_OPACITY = 100;
+
+var WindowPreviewLayout = GObject.registerClass({
+    Properties: {
+        'bounding-box': GObject.ParamSpec.boxed(
+            'bounding-box', 'Bounding box', 'Bounding box',
+            GObject.ParamFlags.READABLE,
+            Clutter.ActorBox.$gtype),
+    },
+}, class WindowPreviewLayout extends Clutter.LayoutManager {
+    _init() {
+        super._init();
+
+        this._container = null;
+        this._boundingBox = new Clutter.ActorBox();
+        this._windows = new Map();
+    }
+
+    _layoutChanged() {
+        let frameRect;
+
+        for (const windowInfo of this._windows.values()) {
+            const frame = windowInfo.metaWindow.get_frame_rect();
+            frameRect = frameRect ? frameRect.union(frame) : frame;
+        }
+
+        if (!frameRect)
+            frameRect = new Meta.Rectangle();
+
+        const oldBox = this._boundingBox.copy();
+        this._boundingBox.set_origin(frameRect.x, frameRect.y);
+        this._boundingBox.set_size(frameRect.width, frameRect.height);
+
+        if (!this._boundingBox.equal(oldBox))
+            this.notify('bounding-box');
+
+        // Always call layout_changed(), a size or position change of an
+        // attached dialog might not affect the boundingBox
+        this.layout_changed();
+    }
+
+    vfunc_set_container(container) {
+        this._container = container;
+    }
+
+    vfunc_get_preferred_height(_container, _forWidth) {
+        return [0, this._boundingBox.get_height()];
+    }
+
+    vfunc_get_preferred_width(_container, _forHeight) {
+        return [0, this._boundingBox.get_width()];
+    }
+
+    vfunc_allocate(container, box) {
+        // If the scale isn't 1, we weren't allocated our preferred size
+        // and have to scale the children allocations accordingly.
+        const scaleX = this._boundingBox.get_width() > 0
+            ? box.get_width() / this._boundingBox.get_width()
+            : 1;
+        const scaleY = this._boundingBox.get_height() > 0
+            ? box.get_height() / this._boundingBox.get_height()
+            : 1;
+
+        const childBox = new Clutter.ActorBox();
+
+        for (const child of container) {
+            if (!child.visible)
+                continue;
+
+            const windowInfo = this._windows.get(child);
+            if (windowInfo) {
+                const bufferRect = windowInfo.metaWindow.get_buffer_rect();
+                childBox.set_origin(
+                    bufferRect.x - this._boundingBox.x1,
+                    bufferRect.y - this._boundingBox.y1);
+
+                const [, , natWidth, natHeight] = child.get_preferred_size();
+                childBox.set_size(natWidth, natHeight);
+
+                childBox.x1 *= scaleX;
+                childBox.x2 *= scaleX;
+                childBox.y1 *= scaleY;
+                childBox.y2 *= scaleY;
+
+                child.allocate(childBox);
+            } else {
+                child.allocate_preferred_size(0, 0);
+            }
+        }
+    }
+
+    /**
+     * addWindow:
+     * @param {Meta.Window} window: the MetaWindow instance
+     *
+     * Creates a ClutterActor drawing the texture of @window and adds it
+     * to the container. If @window is already part of the preview, this
+     * function will do nothing.
+     *
+     * @returns {Clutter.Actor} The newly created actor drawing @window
+     */
+    addWindow(window) {
+        const index = [...this._windows.values()].findIndex(info =>
+            info.metaWindow === window);
+
+        if (index !== -1)
+            return null;
+
+        const windowActor = window.get_compositor_private();
+        const actor = new Clutter.Clone({ source: windowActor });
+
+        this._windows.set(actor, {
+            metaWindow: window,
+            windowActor,
+            sizeChangedId: window.connect('size-changed', () =>
+                this._layoutChanged()),
+            positionChangedId: window.connect('position-changed', () =>
+                this._layoutChanged()),
+            windowActorDestroyId: windowActor.connect('destroy', () =>
+                actor.destroy()),
+            destroyId: actor.connect('destroy', () =>
+                this.removeWindow(window)),
+        });
+
+        this._container.add_child(actor);
+
+        this._layoutChanged();
+
+        return actor;
+    }
+
+    /**
+     * removeWindow:
+     * @param {Meta.Window} window: the window to remove from the preview
+     *
+     * Removes a MetaWindow @window from the preview which has been added
+     * previously using addWindow(). If @window is not part of preview,
+     * this function will do nothing.
+     */
+    removeWindow(window) {
+        const entry = [...this._windows].find(
+            ([, i]) => i.metaWindow === window);
+
+        if (!entry)
+            return;
+
+        const [actor, windowInfo] = entry;
+
+        windowInfo.metaWindow.disconnect(windowInfo.sizeChangedId);
+        windowInfo.metaWindow.disconnect(windowInfo.positionChangedId);
+        windowInfo.windowActor.disconnect(windowInfo.windowActorDestroyId);
+        actor.disconnect(windowInfo.destroyId);
+
+        this._windows.delete(actor);
+        this._container.remove_child(actor);
+
+        this._layoutChanged();
+    }
+
+    /**
+     * getWindows:
+     *
+     * Gets an array of all MetaWindows that were added to the layout
+     * using addWindow(), ordered by the insertion order.
+     *
+     * @returns {Array} An array including all windows
+     */
+    getWindows() {
+        return [...this._windows.values()].map(i => i.metaWindow);
+    }
+
+    // eslint-disable-next-line camelcase
+    get bounding_box() {
+        return this._boundingBox;
+    }
+});
+
+var WindowPreview = GObject.registerClass({
+    Properties: {
+        'overlay-enabled': GObject.ParamSpec.boolean(
+            'overlay-enabled', 'overlay-enabled', 'overlay-enabled',
+            GObject.ParamFlags.READWRITE,
+            true),
+    },
+    Signals: {
+        'drag-begin': {},
+        'drag-cancelled': {},
+        'drag-end': {},
+        'selected': { param_types: [GObject.TYPE_UINT] },
+        'show-chrome': {},
+        'size-changed': {},
+    },
+}, class WindowPreview extends St.Widget {
+    _init(metaWindow, workspace) {
+        this.metaWindow = metaWindow;
+        this.metaWindow._delegate = this;
+        this._windowActor = metaWindow.get_compositor_private();
+        this._workspace = workspace;
+
+        super._init({
+            reactive: true,
+            can_focus: true,
+            accessible_role: Atk.Role.PUSH_BUTTON,
+            offscreen_redirect: Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY,
+        });
+
+        this._windowContainer = new Clutter.Actor();
+        // gjs currently can't handle setting an actors layout manager during
+        // the initialization of the actor if that layout manager keeps track
+        // of its container, so set the layout manager after creating the
+        // container
+        this._windowContainer.layout_manager = new WindowPreviewLayout();
+        this.add_child(this._windowContainer);
+
+        this._addWindow(metaWindow);
+
+        this._delegate = this;
+
+        this._stackAbove = null;
+
+        this._windowContainer.layout_manager.connect(
+            'notify::bounding-box', layout => {
+                // A bounding box of 0x0 means all windows were removed
+                if (layout.bounding_box.get_area() > 0)
+                    this.emit('size-changed');
+            });
+
+        this._windowDestroyId =
+            this._windowActor.connect('destroy', () => this.destroy());
+
+        this._updateAttachedDialogs();
+
+        let clickAction = new Clutter.ClickAction();
+        clickAction.connect('clicked', () => this._activate());
+        clickAction.connect('long-press', this._onLongPress.bind(this));
+        this.add_action(clickAction);
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._draggable = DND.makeDraggable(this,
+                                            { restoreOnSuccess: true,
+                                              manualMode: true,
+                                              dragActorMaxSize: WINDOW_DND_SIZE,
+                                              dragActorOpacity: DRAGGING_WINDOW_OPACITY });
+        this._draggable.connect('drag-begin', this._onDragBegin.bind(this));
+        this._draggable.connect('drag-cancelled', this._onDragCancelled.bind(this));
+        this._draggable.connect('drag-end', this._onDragEnd.bind(this));
+        this.inDrag = false;
+
+        this._selected = false;
+        this._overlayEnabled = true;
+        this._closeRequested = false;
+        this._idleHideOverlayId = 0;
+
+        this._border = new St.Widget({
+            visible: false,
+            style_class: 'window-clone-border',
+        });
+        this._borderConstraint = new Clutter.BindConstraint({
+            source: this._windowContainer,
+            coordinate: Clutter.BindCoordinate.SIZE,
+        });
+        this._border.add_constraint(this._borderConstraint);
+        this._border.add_constraint(new Clutter.AlignConstraint({
+            source: this._windowContainer,
+            align_axis: Clutter.AlignAxis.BOTH,
+            factor: 0.5,
+        }));
+        this._borderCenter = new Clutter.Actor();
+        this._border.bind_property('visible', this._borderCenter, 'visible',
+            GObject.BindingFlags.SYNC_CREATE);
+        this._borderCenterConstraint = new Clutter.BindConstraint({
+            source: this._windowContainer,
+            coordinate: Clutter.BindCoordinate.SIZE,
+        });
+        this._borderCenter.add_constraint(this._borderCenterConstraint);
+        this._borderCenter.add_constraint(new Clutter.AlignConstraint({
+            source: this._windowContainer,
+            align_axis: Clutter.AlignAxis.BOTH,
+            factor: 0.5,
+        }));
+        this._border.connect('style-changed',
+            this._onBorderStyleChanged.bind(this));
+
+        this._title = new St.Label({
+            visible: false,
+            style_class: 'window-caption',
+            text: this._getCaption(),
+            reactive: true,
+        });
+        this._title.add_constraint(new Clutter.BindConstraint({
+            source: this._borderCenter,
+            coordinate: Clutter.BindCoordinate.POSITION,
+        }));
+        this._title.add_constraint(new Clutter.AlignConstraint({
+            source: this._borderCenter,
+            align_axis: Clutter.AlignAxis.X_AXIS,
+            factor: 0.5,
+        }));
+        this._title.add_constraint(new Clutter.AlignConstraint({
+            source: this._borderCenter,
+            align_axis: Clutter.AlignAxis.Y_AXIS,
+            pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+            factor: 1,
+        }));
+        this._title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        this.label_actor = this._title;
+        this._updateCaptionId = this.metaWindow.connect('notify::title', () => {
+            this._title.text = this._getCaption();
+        });
+
+        const layout = Meta.prefs_get_button_layout();
+        this._closeButtonSide =
+            layout.left_buttons.includes(Meta.ButtonFunction.CLOSE)
+                ? St.Side.LEFT : St.Side.RIGHT;
+
+        this._closeButton = new St.Button({
+            visible: false,
+            style_class: 'window-close',
+            child: new St.Icon({ icon_name: 'window-close-symbolic' }),
+        });
+        this._closeButton.add_constraint(new Clutter.BindConstraint({
+            source: this._borderCenter,
+            coordinate: Clutter.BindCoordinate.POSITION,
+        }));
+        this._closeButton.add_constraint(new Clutter.AlignConstraint({
+            source: this._borderCenter,
+            align_axis: Clutter.AlignAxis.X_AXIS,
+            pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+            factor: this._closeButtonSide === St.Side.LEFT ? 0 : 1,
+        }));
+        this._closeButton.add_constraint(new Clutter.AlignConstraint({
+            source: this._borderCenter,
+            align_axis: Clutter.AlignAxis.Y_AXIS,
+            pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+            factor: 0,
+        }));
+        this._closeButton.connect('clicked', () => this._deleteAll());
+
+        this.add_child(this._borderCenter);
+        this.add_child(this._border);
+        this.add_child(this._title);
+        this.add_child(this._closeButton);
+
+        this.connect('notify::realized', () => {
+            if (!this.realized)
+                return;
+
+            this._border.ensure_style();
+            this._title.ensure_style();
+        });
+    }
+
+    vfunc_get_preferred_width(forHeight) {
+        const themeNode = this.get_theme_node();
+
+        // Only include window previews in size request, not chrome
+        const [minWidth, natWidth] =
+            this._windowContainer.get_preferred_width(
+                themeNode.adjust_for_height(forHeight));
+
+        return themeNode.adjust_preferred_width(minWidth, natWidth);
+    }
+
+    vfunc_get_preferred_height(forWidth) {
+        const themeNode = this.get_theme_node();
+        const [minHeight, natHeight] =
+            this._windowContainer.get_preferred_height(
+                themeNode.adjust_for_width(forWidth));
+
+        return themeNode.adjust_preferred_height(minHeight, natHeight);
+    }
+
+    vfunc_allocate(box) {
+        this.set_allocation(box);
+
+        for (const child of this)
+            child.allocate_available_size(0, 0, box.get_width(), box.get_height());
+    }
+
+    _onBorderStyleChanged() {
+        let borderNode = this._border.get_theme_node();
+        this._borderSize = borderNode.get_border_width(St.Side.TOP);
+
+        // Increase the size of the border actor so the border outlines
+        // the bounding box
+        this._borderConstraint.offset = this._borderSize * 2;
+        this._borderCenterConstraint.offset = this._borderSize;
+    }
+
+    _windowCanClose() {
+        return this.metaWindow.can_close() &&
+               !this._hasAttachedDialogs();
+    }
+
+    _getCaption() {
+        if (this.metaWindow.title)
+            return this.metaWindow.title;
+
+        let tracker = Shell.WindowTracker.get_default();
+        let app = tracker.get_window_app(this.metaWindow);
+        return app.get_name();
+    }
+
+    chromeHeights() {
+        const [, closeButtonHeight] = this._closeButton.get_preferred_height(-1);
+        const [, titleHeight] = this._title.get_preferred_height(-1);
+
+        const topOversize = (this._borderSize / 2) + (closeButtonHeight / 2);
+        const bottomOversize = Math.max(
+            this._borderSize,
+            (titleHeight / 2) + (this._borderSize / 2));
+
+        return [topOversize, bottomOversize];
+    }
+
+    chromeWidths() {
+        const [, closeButtonWidth] = this._closeButton.get_preferred_width(-1);
+
+        const leftOversize = this._closeButtonSide === St.Side.LEFT
+            ? (this._borderSize / 2) + (closeButtonWidth / 2)
+            : this._borderSize;
+        const rightOversize = this._closeButtonSide === St.Side.LEFT
+            ? this._borderSize
+            : (this._borderSize / 2) + (closeButtonWidth / 2);
+
+        return [leftOversize, rightOversize];
+    }
+
+    showOverlay(animate) {
+        if (!this._overlayEnabled)
+            return;
+
+        const ongoingTransition = this._border.get_transition('opacity');
+
+        // Don't do anything if we're fully visible already
+        if (this._border.visible && !ongoingTransition)
+            return;
+
+        // If we're supposed to animate and an animation in our direction
+        // is already happening, let that one continue
+        if (animate &&
+            ongoingTransition &&
+            ongoingTransition.get_interval().peek_final_value() === 255)
+            return;
+
+        const toShow = this._windowCanClose()
+            ? [this._border, this._title, this._closeButton]
+            : [this._border, this._title];
+
+        toShow.forEach(a => {
+            a.opacity = 0;
+            a.show();
+            a.ease({
+                opacity: 255,
+                duration: animate ? WINDOW_OVERLAY_FADE_TIME : 0,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            });
+        });
+
+        this.emit('show-chrome');
+    }
+
+    hideOverlay(animate) {
+        const ongoingTransition = this._border.get_transition('opacity');
+
+        // Don't do anything if we're fully hidden already
+        if (!this._border.visible && !ongoingTransition)
+            return;
+
+        // If we're supposed to animate and an animation in our direction
+        // is already happening, let that one continue
+        if (animate &&
+            ongoingTransition &&
+            ongoingTransition.get_interval().peek_final_value() === 0)
+            return;
+
+        [this._border, this._title, this._closeButton].forEach(a => {
+            a.opacity = 255;
+            a.ease({
+                opacity: 0,
+                duration: animate ? WINDOW_OVERLAY_FADE_TIME : 0,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+                onComplete: () => a.hide(),
+            });
+        });
+    }
+
+    _addWindow(metaWindow) {
+        const clone = this._windowContainer.layout_manager.addWindow(metaWindow);
+
+        // We expect this to be used for all interaction rather than
+        // the ClutterClone; as the former is reactive and the latter
+        // is not, this just works for most cases. However, for DND all
+        // actors are picked, so DND operations would operate on the clone.
+        // To avoid this, we hide it from pick.
+        Shell.util_set_hidden_from_pick(clone, true);
+    }
+
+    vfunc_has_overlaps() {
+        return this._hasAttachedDialogs();
+    }
+
+    _deleteAll() {
+        const windows = this._windowContainer.layout_manager.getWindows();
+
+        // Delete all windows, starting from the bottom-most (most-modal) one
+        for (const window of windows.reverse())
+            window.delete(global.get_current_time());
+
+        this._closeRequested = true;
+    }
+
+    addDialog(win) {
+        let parent = win.get_transient_for();
+        while (parent.is_attached_dialog())
+            parent = parent.get_transient_for();
+
+        // Display dialog if it is attached to our metaWindow
+        if (win.is_attached_dialog() && parent == this.metaWindow)
+            this._addWindow(win);
+
+        // The dialog popped up after the user tried to close the window,
+        // assume it's a close confirmation and leave the overview
+        if (this._closeRequested)
+            this._activate();
+    }
+
+    _hasAttachedDialogs() {
+        return this._windowContainer.layout_manager.getWindows().length > 1;
+    }
+
+    _updateAttachedDialogs() {
+        let iter = win => {
+            let actor = win.get_compositor_private();
+
+            if (!actor)
+                return false;
+            if (!win.is_attached_dialog())
+                return false;
+
+            this._addWindow(win);
+            win.foreach_transient(iter);
+            return true;
+        };
+        this.metaWindow.foreach_transient(iter);
+    }
+
+    get boundingBox() {
+        const box = this._windowContainer.layout_manager.bounding_box;
+
+        return {
+            x: box.x1,
+            y: box.y1,
+            width: box.get_width(),
+            height: box.get_height(),
+        };
+    }
+
+    get windowCenter() {
+        const box = this._windowContainer.layout_manager.bounding_box;
+
+        return new Graphene.Point({
+            x: box.get_x() + box.get_width() / 2,
+            y: box.get_y() + box.get_height() / 2,
+        });
+    }
+
+    // eslint-disable-next-line camelcase
+    get overlay_enabled() {
+        return this._overlayEnabled;
+    }
+
+    // eslint-disable-next-line camelcase
+    set overlay_enabled(enabled) {
+        if (this._overlayEnabled === enabled)
+            return;
+
+        this._overlayEnabled = enabled;
+        this.notify('overlay-enabled');
+
+        if (!enabled)
+            this.hideOverlay(false);
+        else if (this['has-pointer'] || global.stage.key_focus === this)
+            this.showOverlay(true);
+    }
+
+    // Find the actor just below us, respecting reparenting done by DND code
+    _getActualStackAbove() {
+        if (this._stackAbove == null)
+            return null;
+
+        if (this.inDrag) {
+            if (this._stackAbove._delegate)
+                return this._stackAbove._delegate._getActualStackAbove();
+            else
+                return null;
+        } else {
+            return this._stackAbove;
+        }
+    }
+
+    setStackAbove(actor) {
+        this._stackAbove = actor;
+        if (this.inDrag)
+            // We'll fix up the stack after the drag
+            return;
+
+        let parent = this.get_parent();
+        let actualAbove = this._getActualStackAbove();
+        if (actualAbove == null)
+            parent.set_child_below_sibling(this, null);
+        else
+            parent.set_child_above_sibling(this, actualAbove);
+    }
+
+    _onDestroy() {
+        this._windowActor.disconnect(this._windowDestroyId);
+
+        this.metaWindow._delegate = null;
+        this._delegate = null;
+
+        this.metaWindow.disconnect(this._updateCaptionId);
+
+        if (this._longPressLater) {
+            Meta.later_remove(this._longPressLater);
+            delete this._longPressLater;
+        }
+
+        if (this._idleHideOverlayId > 0) {
+            GLib.source_remove(this._idleHideOverlayId);
+            this._idleHideOverlayId = 0;
+        }
+
+        if (this.inDrag) {
+            this.emit('drag-end');
+            this.inDrag = false;
+        }
+    }
+
+    _activate() {
+        this._selected = true;
+        this.emit('selected', global.get_current_time());
+    }
+
+    vfunc_enter_event(crossingEvent) {
+        this.showOverlay(true);
+        return super.vfunc_enter_event(crossingEvent);
+    }
+
+    vfunc_leave_event(crossingEvent) {
+        if (this._idleHideOverlayId > 0)
+            GLib.source_remove(this._idleHideOverlayId);
+
+        this._idleHideOverlayId = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            WINDOW_OVERLAY_IDLE_HIDE_TIMEOUT, () => {
+                if (this._closeButton['has-pointer'] ||
+                    this._title['has-pointer'])
+                    return GLib.SOURCE_CONTINUE;
+
+                if (!this['has-pointer'])
+                    this.hideOverlay(true);
+
+                this._idleHideOverlayId = 0;
+                return GLib.SOURCE_REMOVE;
+            });
+
+        GLib.Source.set_name_by_id(this._idleHideOverlayId, '[gnome-shell] this._idleHideOverlayId');
+
+        return super.vfunc_leave_event(crossingEvent);
+    }
+
+    vfunc_key_focus_in() {
+        super.vfunc_key_focus_in();
+        this.showOverlay(true);
+    }
+
+    vfunc_key_focus_out() {
+        super.vfunc_key_focus_out();
+        this.hideOverlay(true);
+    }
+
+    vfunc_key_press_event(keyEvent) {
+        let symbol = keyEvent.keyval;
+        let isEnter = symbol == Clutter.KEY_Return || symbol == Clutter.KEY_KP_Enter;
+        if (isEnter) {
+            this._activate();
+            return true;
+        }
+
+        return super.vfunc_key_press_event(keyEvent);
+    }
+
+    _onLongPress(action, actor, state) {
+        // Take advantage of the Clutter policy to consider
+        // a long-press canceled when the pointer movement
+        // exceeds dnd-drag-threshold to manually start the drag
+        if (state == Clutter.LongPressState.CANCEL) {
+            let event = Clutter.get_current_event();
+            this._dragTouchSequence = event.get_event_sequence();
+
+            if (this._longPressLater)
+                return true;
+
+            // A click cancels a long-press before any click handler is
+            // run - make sure to not start a drag in that case
+            this._longPressLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                delete this._longPressLater;
+                if (this._selected)
+                    return;
+                let [x, y] = action.get_coords();
+                action.release();
+                this._draggable.startDrag(x, y, global.get_current_time(), this._dragTouchSequence, event.get_device());
+            });
+        } else {
+            this.showOverlay(true);
+        }
+        return true;
+    }
+
+    _onDragBegin(_draggable, _time) {
+        this.inDrag = true;
+        this.hideOverlay(false);
+        this.emit('drag-begin');
+    }
+
+    handleDragOver(source, actor, x, y, time) {
+        return this._workspace.handleDragOver(source, actor, x, y, time);
+    }
+
+    acceptDrop(source, actor, x, y, time) {
+        return this._workspace.acceptDrop(source, actor, x, y, time);
+    }
+
+    _onDragCancelled(_draggable, _time) {
+        this.emit('drag-cancelled');
+    }
+
+    _onDragEnd(_draggable, _time, _snapback) {
+        this.inDrag = false;
+
+        // We may not have a parent if DnD completed successfully, in
+        // which case our clone will shortly be destroyed and replaced
+        // with a new one on the target workspace.
+        let parent = this.get_parent();
+        if (parent !== null) {
+            if (this._stackAbove == null)
+                parent.set_child_below_sibling(this, null);
+            else
+                parent.set_child_above_sibling(this, this._stackAbove);
+        }
+
+        if (this['has-pointer'])
+            this.showOverlay(true);
+
+        this.emit('drag-end');
+    }
+});
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -11,7 +11,10 @@ var DISPLAY_TIMEOUT = 600;
 var WorkspaceSwitcherPopupList = GObject.registerClass(
 class WorkspaceSwitcherPopupList extends St.Widget {
    _init() {
-        super._init({ style_class: 'workspace-switcher' });
+        super._init({
+            style_class: 'workspace-switcher',
+            offscreen_redirect: Clutter.OffscreenRedirect.ALWAYS,
+        });

        this._itemSpacing = 0;
        this._childHeight = 0;
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -549,9 +549,7 @@ var WorkspaceThumbnail = GObject.registerClass({
            return;

        // a click on the already current workspace should go back to the main view
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-        if (this.metaWorkspace == activeWorkspace)
+        if (this.metaWorkspace.active)
            Main.overview.hide();
        else
            this.metaWorkspace.activate(time);
@ -567,7 +565,8 @@ var WorkspaceThumbnail = GObject.registerClass({
        if (this.state > ThumbnailState.NORMAL)
            return DND.DragMotionResult.CONTINUE;

-        if (source.realWindow && !this._isMyWindow(source.realWindow))
+        if (source.metaWindow &&
+            !this._isMyWindow(source.metaWindow.get_compositor_private()))
            return DND.DragMotionResult.MOVE_DROP;
        if (source.app && source.app.can_open_new_window())
            return DND.DragMotionResult.COPY_DROP;
@ -581,8 +580,8 @@ var WorkspaceThumbnail = GObject.registerClass({
        if (this.state > ThumbnailState.NORMAL)
            return false;

-        if (source.realWindow) {
-            let win = source.realWindow;
+        if (source.metaWindow) {
+            let win = source.metaWindow.get_compositor_private();
            if (this._isMyWindow(win))
                return false;

@ -795,7 +794,7 @@ var ThumbnailsBox = GObject.registerClass({

    // Draggable target interface
    handleDragOver(source, actor, x, y, time) {
-        if (!source.realWindow &&
+        if (!source.metaWindow &&
            (!source.app || !source.app.can_open_new_window()) &&
            (source.app || !source.shellWorkspaceLaunch) &&
            source != Main.xdndHandler)
@ -846,7 +845,7 @@ var ThumbnailsBox = GObject.registerClass({
        if (this._dropWorkspace != -1)
            return this._thumbnails[this._dropWorkspace].handleDragOverInternal(source, actor, time);
        else if (this._dropPlaceholderPos != -1)
-            return source.realWindow ? DND.DragMotionResult.MOVE_DROP : DND.DragMotionResult.COPY_DROP;
+            return source.metaWindow ? DND.DragMotionResult.MOVE_DROP : DND.DragMotionResult.COPY_DROP;
        else
            return DND.DragMotionResult.CONTINUE;
    }
@ -855,12 +854,12 @@ var ThumbnailsBox = GObject.registerClass({
        if (this._dropWorkspace != -1) {
            return this._thumbnails[this._dropWorkspace].acceptDropInternal(source, actor, time);
        } else if (this._dropPlaceholderPos != -1) {
-            if (!source.realWindow &&
+            if (!source.metaWindow &&
                (!source.app || !source.app.can_open_new_window()) &&
                (source.app || !source.shellWorkspaceLaunch))
                return false;

-            let isWindow = !!source.realWindow;
+            let isWindow = !!source.metaWindow;

            let newWorkspaceIndex;
            [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -7,6 +7,7 @@ const Main = imports.ui.main;
 const SwipeTracker = imports.ui.swipeTracker;
 const Workspace = imports.ui.workspace;

+var { ANIMATION_TIME } = imports.ui.overview;
 var WORKSPACE_SWITCH_TIME = 250;
 var SCROLL_TIMEOUT_TIME = 150;

@ -21,18 +22,18 @@ var WorkspacesViewBase = GObject.registerClass({
    GTypeFlags: GObject.TypeFlags.ABSTRACT,
 }, class WorkspacesViewBase extends St.Widget {
    _init(monitorIndex) {
-        super._init({ style_class: 'workspaces-view', reactive: true });
+        const { x, y, width, height } =
+            Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
+
+        super._init({
+            style_class: 'workspaces-view',
+            x, y, width, height,
+        });
        this.connect('destroy', this._onDestroy.bind(this));
        global.focus_manager.add_group(this);

-        // The actor itself isn't a drop target, so we don't want to pick on its area
-        this.set_size(0, 0);
-
        this._monitorIndex = monitorIndex;

-        this._fullGeometry = null;
-        this._actualGeometry = null;
-
        this._inDrag = false;
        this._windowDragBeginId = Main.overview.connect('window-drag-begin', this._dragBegin.bind(this));
        this._windowDragEndId = Main.overview.connect('window-drag-end', this._dragEnd.bind(this));
@ -51,24 +52,19 @@ var WorkspacesViewBase = GObject.registerClass({
        }
    }

-    _dragBegin(overview, window) {
+    _dragBegin() {
        this._inDrag = true;
-        this._setReservedSlot(window);
    }

    _dragEnd() {
        this._inDrag = false;
-        this._setReservedSlot(null);
    }

-    setFullGeometry(geom) {
-        this._fullGeometry = geom;
-        this._syncFullGeometry();
-    }
+    vfunc_allocate(box) {
+        this.set_allocation(box);

-    setActualGeometry(geom) {
-        this._actualGeometry = geom;
-        this._syncActualGeometry();
+        for (const child of this)
+            child.allocate_available_size(0, 0, box.get_width(), box.get_height());
    }
 });

@ -83,9 +79,8 @@ class WorkspacesView extends WorkspacesViewBase {
        this._gestureActive = false; // touch(pad) gestures

        this._scrollAdjustment = scrollAdjustment;
-        this._onScrollId =
-            this._scrollAdjustment.connect('notify::value',
-                this._onScroll.bind(this));
+        this._onScrollId = this._scrollAdjustment.connect('notify::value',
+            this._updateScrollPosition.bind(this));

        this._workspaces = [];
        this._updateWorkspaces();
@ -97,34 +92,42 @@ class WorkspacesView extends WorkspacesViewBase {
                this._workspaces.sort((a, b) => {
                    return a.metaWorkspace.index() - b.metaWorkspace.index();
                });
-                this._updateWorkspaceActors(false);
+                this._workspaces.forEach(
+                    (ws, i) => this.set_child_at_index(ws, i));
            });

-
-        this._overviewShownId =
-            Main.overview.connect('shown', () => {
-                this.set_clip(this._fullGeometry.x, this._fullGeometry.y,
-                              this._fullGeometry.width, this._fullGeometry.height);
-            });
+        this._overviewShownId = Main.overview.connect('shown', () => {
+            this.clip_to_allocation = true;
+        });

        this._switchWorkspaceNotifyId =
            global.window_manager.connect('switch-workspace',
                                          this._activeWorkspaceChanged.bind(this));
    }

-    _setReservedSlot(window) {
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setReservedSlot(window);
-    }
+    vfunc_allocate(box) {
+        this.set_allocation(box);

-    _syncFullGeometry() {
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setFullGeometry(this._fullGeometry);
-    }
+        if (this.get_n_children() === 0)
+            return;

-    _syncActualGeometry() {
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setActualGeometry(this._actualGeometry);
+        const { workspaceManager } = global;
+        const { nWorkspaces } = workspaceManager;
+
+        const vertical = workspaceManager.layout_rows === -1;
+        const rtl = this.text_direction === Clutter.TextDirection.RTL;
+
+        this._workspaces.forEach((child, index) => {
+            if (rtl && !vertical)
+                index = nWorkspaces - index - 1;
+
+            const x = vertical ? 0 : index * this.width;
+            const y = vertical ? index * this.height : 0;
+
+            child.allocate_available_size(x, y, box.get_width(), box.get_height());
+        });
+
+        this._updateScrollPosition();
    }

    getActiveWorkspace() {
@ -140,11 +143,11 @@ class WorkspacesView extends WorkspacesViewBase {
            else
                this._workspaces[w].fadeToOverview();
        }
-        this._updateWorkspaceActors(false);
+        this._updateScrollPosition();
    }

    animateFromOverview(animationType) {
-        this.remove_clip();
+        this.clip_to_allocation = false;

        for (let w = 0; w < this._workspaces.length; w++) {
            if (animationType == AnimationType.ZOOM)
@ -159,49 +162,22 @@ class WorkspacesView extends WorkspacesViewBase {
            this._workspaces[i].syncStacking(stackIndices);
    }

-    // Update workspace actors parameters
-    // @showAnimation: iff %true, transition between states
-    _updateWorkspaceActors(showAnimation) {
-        let workspaceManager = global.workspace_manager;
-        let active = workspaceManager.get_active_workspace_index();
+    _scrollToActive() {
+        const { workspaceManager } = global;
+        const active = workspaceManager.get_active_workspace_index();

-        this._animating = showAnimation;
+        this._animating = true;
+        this._updateVisibility();

-        for (let w = 0; w < this._workspaces.length; w++) {
-            let workspace = this._workspaces[w];
-
-            workspace.remove_all_transitions();
-
-            let params = {};
-            if (workspaceManager.layout_rows == -1)
-                params.y = (w - active) * this._fullGeometry.height;
-            else if (this.text_direction == Clutter.TextDirection.RTL)
-                params.x = (active - w) * this._fullGeometry.width;
-            else
-                params.x = (w - active) * this._fullGeometry.width;
-
-            if (showAnimation) {
-                let easeParams = Object.assign(params, {
-                    duration: WORKSPACE_SWITCH_TIME,
-                    mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
-                });
-                // we have to call _updateVisibility() once before the
-                // animation and once afterwards - it does not really
-                // matter which tween we use, so we pick the first one ...
-                if (w == 0) {
-                    this._updateVisibility();
-                    easeParams.onComplete = () => {
-                        this._animating = false;
-                        this._updateVisibility();
-                    };
-                }
-                workspace.ease(easeParams);
-            } else {
-                workspace.set(params);
-                if (w == 0)
-                    this._updateVisibility();
-            }
-        }
+        this._scrollAdjustment.remove_transition('value');
+        this._scrollAdjustment.ease(active, {
+            duration: WORKSPACE_SWITCH_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
+            onComplete: () => {
+                this._animating = false;
+                this._updateVisibility();
+            },
+        });
    }

    _updateVisibility() {
@ -242,19 +218,14 @@ class WorkspacesView extends WorkspacesViewBase {
            }
        }

-        if (this._fullGeometry) {
-            this._updateWorkspaceActors(false);
-            this._syncFullGeometry();
-        }
-        if (this._actualGeometry)
-            this._syncActualGeometry();
+        this._updateScrollPosition();
    }

    _activeWorkspaceChanged(_wm, _from, _to, _direction) {
        if (this._scrolling)
            return;

-        this._updateWorkspaceActors(true);
+        this._scrollToActive();
    }

    _onDestroy() {
@ -270,27 +241,33 @@ class WorkspacesView extends WorkspacesViewBase {

    startTouchGesture() {
        this._gestureActive = true;
+
+        this._updateVisibility();
    }

    endTouchGesture() {
        this._gestureActive = false;

        // Make sure title captions etc are shown as necessary
-        this._updateWorkspaceActors(true);
+        this._scrollToActive();
        this._updateVisibility();
    }

    // sync the workspaces' positions to the value of the scroll adjustment
    // and change the active workspace if appropriate
-    _onScroll(adj) {
-        if (adj.get_transition('value') !== null && !this._gestureActive)
+    _updateScrollPosition() {
+        if (!this.has_allocation())
            return;

+        const adj = this._scrollAdjustment;
+        const allowSwitch =
+            adj.get_transition('value') === null && !this._gestureActive;
+
        let workspaceManager = global.workspace_manager;
        let active = workspaceManager.get_active_workspace_index();
        let current = Math.round(adj.value);

-        if (active != current && !this._gestureActive) {
+        if (allowSwitch && active !== current) {
            if (!this._workspaces[current]) {
                // The current workspace was destroyed. This could happen
                // when you are on the last empty workspace, and consolidate
@ -307,36 +284,16 @@ class WorkspacesView extends WorkspacesViewBase {
        if (adj.upper == 1)
            return;

-        let last = this._workspaces.length - 1;
+        const vertical = workspaceManager.layout_rows === -1;
+        const rtl = this.text_direction === Clutter.TextDirection.RTL;
+        const progress = vertical || !rtl
+            ? adj.value : adj.upper - adj.value;

-        if (workspaceManager.layout_rows == -1) {
-            let firstWorkspaceY = this._workspaces[0].y;
-            let lastWorkspaceY = this._workspaces[last].y;
-            let workspacesHeight = lastWorkspaceY - firstWorkspaceY;
-
-            let currentY = firstWorkspaceY;
-            let newY = -Math.round(adj.value / (adj.upper - 1) * workspacesHeight);
-
-            let dy = newY - currentY;
-
-            for (let i = 0; i < this._workspaces.length; i++) {
-                this._workspaces[i].visible = Math.abs(i - adj.value) <= 1;
-                this._workspaces[i].y += dy;
-            }
-        } else {
-            let firstWorkspaceX = this._workspaces[0].x;
-            let lastWorkspaceX = this._workspaces[last].x;
-            let workspacesWidth = lastWorkspaceX - firstWorkspaceX;
-
-            let currentX = firstWorkspaceX;
-            let newX = -Math.round(adj.value / (adj.upper - 1) * workspacesWidth);
-
-            let dx = newX - currentX;
-
-            for (let i = 0; i < this._workspaces.length; i++) {
-                this._workspaces[i].visible = Math.abs(i - adj.value) <= 1;
-                this._workspaces[i].x += dx;
-            }
+        for (const ws of this._workspaces) {
+            if (vertical)
+                ws.translation_y = -progress * this.height;
+            else
+                ws.translation_x = -progress * this.width;
        }
    }
 });
@ -349,18 +306,6 @@ class ExtraWorkspaceView extends WorkspacesViewBase {
        this.add_actor(this._workspace);
    }

-    _setReservedSlot(window) {
-        this._workspace.setReservedSlot(window);
-    }
-
-    _syncFullGeometry() {
-        this._workspace.setFullGeometry(this._fullGeometry);
-    }
-
-    _syncActualGeometry() {
-        this._workspace.setActualGeometry(this._actualGeometry);
-    }
-
    getActiveWorkspace() {
        return this._workspace;
    }
@ -393,7 +338,10 @@ class ExtraWorkspaceView extends WorkspacesViewBase {
 var WorkspacesDisplay = GObject.registerClass(
 class WorkspacesDisplay extends St.Widget {
    _init(scrollAdjustment) {
-        super._init({ clip_to_allocation: true });
+        super._init({
+            visible: false,
+            clip_to_allocation: true,
+        });
        this.connect('notify::allocation', this._updateWorkspacesActualGeometry.bind(this));

        let workspaceManager = global.workspace_manager;
@ -435,6 +383,10 @@ class WorkspacesDisplay extends St.Widget {
        this._windowDragEndId =
            Main.overview.connect('window-drag-begin',
                this._windowDragEnd.bind(this));
+        this._overviewShownId = Main.overview.connect('shown', () => {
+            this._inWindowFade = false;
+            this._syncWorkspacesActualGeometry();
+        });

        this._primaryIndex = Main.layoutManager.primaryIndex;
        this._workspacesViews = [];
@ -449,9 +401,11 @@ class WorkspacesDisplay extends St.Widget {
        this._scrollEventId = 0;
        this._keyPressEventId = 0;
        this._scrollTimeoutId = 0;
+        this._syncActualGeometryLater = 0;

-        this._fullGeometry = null;
+        this._actualGeometry = null;
        this._inWindowDrag = false;
+        this._inWindowFade = false;

        this._gestureActive = false; // touch(pad) gestures
        this._canScroll = true; // limiting scrolling speed
@ -472,6 +426,11 @@ class WorkspacesDisplay extends St.Widget {
            this._parentSetLater = 0;
        }

+        if (this._syncActualGeometryLater) {
+            Meta.later_remove(this._syncActualGeometryLater);
+            this._syncActualGeometryLater = 0;
+        }
+
        if (this._scrollTimeoutId !== 0) {
            GLib.source_remove(this._scrollTimeoutId);
            this._scrollTimeoutId = 0;
@ -481,6 +440,7 @@ class WorkspacesDisplay extends St.Widget {
        global.workspace_manager.disconnect(this._reorderWorkspacesdId);
        Main.overview.disconnect(this._windowDragBeginId);
        Main.overview.disconnect(this._windowDragEndId);
+        Main.overview.disconnect(this._overviewShownId);
    }

    _windowDragBegin() {
@ -504,25 +464,11 @@ class WorkspacesDisplay extends St.Widget {
            workspaceManager.get_active_workspace_index();
    }

-    _activeWorkspaceChanged(_wm, _from, _to, _direction) {
+    _activeWorkspaceChanged(_wm, _from, to, _direction) {
        if (this._gestureActive)
            return;

-        this._scrollToActive();
-    }
-
-    _scrollToActive() {
-        let workspaceManager = global.workspace_manager;
-        let active = workspaceManager.get_active_workspace_index();
-
-        this._updateScrollAdjustment(active);
-    }
-
-    _updateScrollAdjustment(index) {
-        if (this._gestureActive)
-            return;
-
-        this._scrollAdjustment.ease(index, {
+        this._scrollAdjustment.ease(to, {
            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
            duration: WORKSPACE_SWITCH_TIME,
        });
@ -560,11 +506,8 @@ class WorkspacesDisplay extends St.Widget {
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].startTouchGesture();

-        let monitors = Main.layoutManager.monitors;
-        let geometry = monitor === this._primaryIndex
-            ? this._fullGeometry : monitors[monitor];
        let distance = global.workspace_manager.layout_rows === -1
-            ? geometry.height : geometry.width;
+            ? this.height : this.width;

        let progress = adjustment.value / adjustment.page_size;
        let points = Array.from(
@ -584,14 +527,13 @@ class WorkspacesDisplay extends St.Widget {
        this._clickAction.release();

        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
        let newWs = workspaceManager.get_workspace_by_index(endProgress);

        this._scrollAdjustment.ease(endProgress, {
            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
            duration,
            onComplete: () => {
-                if (newWs !== activeWorkspace)
+                if (!newWs.active)
                    newWs.activate(global.get_current_time());
                this._endTouchGesture();
            },
@ -608,8 +550,10 @@ class WorkspacesDisplay extends St.Widget {
        return this._getPrimaryView().navigate_focus(from, direction, false);
    }

-    show(fadeOnPrimary) {
+    animateToOverview(fadeOnPrimary) {
+        this.show();
        this._updateWorkspacesViews();
+
        for (let i = 0; i < this._workspacesViews.length; i++) {
            let animationType;
            if (fadeOnPrimary && i == this._primaryIndex)
@ -619,6 +563,11 @@ class WorkspacesDisplay extends St.Widget {
            this._workspacesViews[i].animateToOverview(animationType);
        }

+        this._inWindowFade = fadeOnPrimary;
+
+        if (this._actualGeometry && !fadeOnPrimary)
+            this._syncWorkspacesActualGeometry();
+
        this._restackedNotifyId =
            Main.overview.connect('windows-restacked',
                                  this._onRestacked.bind(this));
@ -638,9 +587,20 @@ class WorkspacesDisplay extends St.Widget {
                animationType = AnimationType.ZOOM;
            this._workspacesViews[i].animateFromOverview(animationType);
        }
+
+        this._inWindowFade = fadeOnPrimary;
+
+        const { primaryIndex } = Main.layoutManager;
+        const { x, y, width, height } =
+            Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
+        this._getPrimaryView().ease({
+            x, y, width, height,
+            duration: fadeOnPrimary ? 0 : ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        });
    }

-    hide() {
+    vfunc_hide() {
        if (this._restackedNotifyId > 0) {
            Main.overview.disconnect(this._restackedNotifyId);
            this._restackedNotifyId = 0;
@ -656,6 +616,8 @@ class WorkspacesDisplay extends St.Widget {
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].destroy();
        this._workspacesViews = [];
+
+        super.vfunc_hide();
    }

    _workspacesOnlyOnPrimaryChanged() {
@ -665,6 +627,7 @@ class WorkspacesDisplay extends St.Widget {
            return;

        this._updateWorkspacesViews();
+        this._syncWorkspacesActualGeometry();
    }

    _updateWorkspacesViews() {
@ -681,17 +644,9 @@ class WorkspacesDisplay extends St.Widget {
            else
                view = new WorkspacesView(i, this._scrollAdjustment);

-            // HACK: Avoid spurious allocation changes while updating views
-            view.hide();
-
            this._workspacesViews.push(view);
            Main.layoutManager.overviewGroup.add_actor(view);
        }
-
-        this._workspacesViews.forEach(v => v.show());
-
-        this._updateWorkspacesFullGeometry();
-        this._updateWorkspacesActualGeometry();
    }

    _getMonitorIndexForEvent(event) {
@ -738,40 +693,35 @@ class WorkspacesDisplay extends St.Widget {
        });
    }

-    // This geometry should always be the fullest geometry
-    // the workspaces switcher can ever be allocated, as if
-    // the sliding controls were never slid in at all.
-    setWorkspacesFullGeometry(geom) {
-        this._fullGeometry = geom;
-        this._updateWorkspacesFullGeometry();
-    }
-
-    _updateWorkspacesFullGeometry() {
-        if (!this._workspacesViews.length)
-            return;
-
-        let monitors = Main.layoutManager.monitors;
-        for (let i = 0; i < monitors.length; i++) {
-            let geometry = i == this._primaryIndex ? this._fullGeometry : monitors[i];
-            this._workspacesViews[i].setFullGeometry(geometry);
-        }
-    }
-
    _updateWorkspacesActualGeometry() {
-        if (!this._workspacesViews.length)
+        const [x, y] = this.get_transformed_position();
+        const width = this.allocation.get_width();
+        const height = this.allocation.get_height();
+
+        this._actualGeometry = { x, y, width, height };
+
+        if (this._syncActualGeometryLater > 0)
            return;

-        let [x, y] = this.get_transformed_position();
-        let allocation = this.allocation;
-        let width = allocation.x2 - allocation.x1;
-        let height = allocation.y2 - allocation.y1;
-        let primaryGeometry = { x, y, width, height };
+        this._syncActualGeometryLater =
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._syncWorkspacesActualGeometry();

-        let monitors = Main.layoutManager.monitors;
-        for (let i = 0; i < monitors.length; i++) {
-            let geometry = i == this._primaryIndex ? primaryGeometry : monitors[i];
-            this._workspacesViews[i].setActualGeometry(geometry);
-        }
+                this._syncActualGeometryLater = 0;
+                return GLib.SOURCE_REMOVE;
+            });
+    }
+
+    _syncWorkspacesActualGeometry() {
+        const primaryView = this._getPrimaryView();
+        if (!primaryView || this._inWindowFade)
+            return;
+
+        primaryView.ease({
+            ...this._actualGeometry,
+            duration: Main.overview.animationInProgress ? ANIMATION_TIME : 0,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        });
    }

    _onRestacked(overview, stackIndices) {
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.37.2',
+  version: '3.37.90',
  meson_version: '>= 0.53.0',
  license: 'GPLv2+'
 )
@ -25,7 +25,7 @@ gio_req = '>= 2.56.0'
 gi_req = '>= 1.49.1'
 gjs_req = '>= 1.65.1'
 gtk_req = '>= 3.15.0'
-mutter_req = '>= 3.37.2'
+mutter_req = '>= 3.37.90'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.33.1'
 startup_req = '>= 0.11'
@ -96,9 +96,10 @@ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
 bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
 gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
 gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+pipewire_dep = dependency('libpipewire-0.3', required: false)

 recorder_deps = []
-enable_recorder = gst_dep.found() and gst_base_dep.found()
+enable_recorder = gst_dep.found() and gst_base_dep.found() and pipewire_dep.found()
 if enable_recorder
  recorder_deps += [gst_dep, gst_base_dep, gtk_dep, x11_dep]
 endif
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -1 +1,3 @@
+data/org.gnome.Shell@wayland.service.in
+data/org.gnome.Shell@x11.service.in
 subprojects/extensions-tool/src/templates/indicator/extension.js
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/ja.po
+++ b/po/ja.po
@ -1,5 +1,5 @@
 # Japanese translation of gnome-shell package.
-# Copyright (C) 2009-2020 the gnome-shell copyright holder.
+# Copyright (C) 2010-2017, 2019-2020 the gnome-shell copyright holder.
 # This file is distributed under the same license as the gnome-shell package.
 # Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2011.
@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-05-04 14:38+0000\n"
-"PO-Revision-Date: 2020-05-13 23:00+0900\n"
+"POT-Creation-Date: 2020-06-10 17:32+0000\n"
+"PO-Revision-Date: 2020-06-11 19:00+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@ -421,7 +421,7 @@ msgstr "拡張機能のホームページを開く"
 #: js/ui/components/networkAgent.js:110 js/ui/components/polkitAgent.js:139
 #: js/ui/endSessionDialog.js:369 js/ui/extensionDownloader.js:181
 #: js/ui/shellMountOperation.js:376 js/ui/shellMountOperation.js:386
-#: js/ui/status/network.js:916 subprojects/extensions-app/js/main.js:148
+#: js/ui/status/network.js:916 subprojects/extensions-app/js/main.js:149
 msgid "Cancel"
 msgstr "キャンセル"

@ -577,7 +577,7 @@ msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間前"

-#: js/misc/util.js:191
+#: js/misc/util.js:191 js/ui/dateMenu.js:162
 msgid "Yesterday"
 msgstr "昨日"

@ -692,56 +692,44 @@ msgstr ""

 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:39 js/ui/status/location.js:374
+#: js/ui/accessDialog.js:39 js/ui/status/location.js:369
 msgid "Deny Access"
 msgstr "拒否"

-#: js/ui/accessDialog.js:40 js/ui/status/location.js:377
+#: js/ui/accessDialog.js:40 js/ui/status/location.js:372
 msgid "Grant Access"
 msgstr "許可"

-#: js/ui/appDisplay.js:943
+#: js/ui/appDisplay.js:902
 msgid "Unnamed Folder"
 msgstr "名前なしのフォルダー"

-#: js/ui/appDisplay.js:966
-msgid "Frequently used applications will appear here"
-msgstr "よく使用するアプリケーションがここに表示されます"
-
-#: js/ui/appDisplay.js:1101
-msgid "Frequent"
-msgstr "常用"
-
-#: js/ui/appDisplay.js:1108
-msgid "All"
-msgstr "すべて"
-
 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2485 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2241 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "開いているウィンドウ"

-#: js/ui/appDisplay.js:2504 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2260 js/ui/panel.js:82
 msgid "New Window"
 msgstr "新しいウィンドウで開く"

-#: js/ui/appDisplay.js:2520
+#: js/ui/appDisplay.js:2276
 msgid "Launch using Integrated Graphics Card"
 msgstr "統合グラフィックカードを使用して起動"

-#: js/ui/appDisplay.js:2521
+#: js/ui/appDisplay.js:2277
 msgid "Launch using Discrete Graphics Card"
 msgstr "ディスクリートグラフィックカードを使用して起動"

-#: js/ui/appDisplay.js:2549 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2305 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "お気に入りから削除"

-#: js/ui/appDisplay.js:2555
+#: js/ui/appDisplay.js:2311
 msgid "Add to Favorites"
 msgstr "お気に入りに追加"

-#: js/ui/appDisplay.js:2565 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2321 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "詳細を表示"

@ -771,7 +759,7 @@ msgstr "ヘッドフォン"
 msgid "Headset"
 msgstr "ヘッドセット"

-#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:270
+#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:273
 msgid "Microphone"
 msgstr "マイク"

@ -788,7 +776,7 @@ msgid "Settings"
 msgstr "設定"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: js/ui/calendar.js:41
+#: js/ui/calendar.js:36
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@ -798,43 +786,43 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: js/ui/calendar.js:70
+#: js/ui/calendar.js:65
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"

 #. Translators: Calendar grid abbreviation for Monday
-#: js/ui/calendar.js:72
+#: js/ui/calendar.js:67
 msgctxt "grid monday"
 msgid "M"
 msgstr "月"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: js/ui/calendar.js:74
+#: js/ui/calendar.js:69
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "火"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: js/ui/calendar.js:76
+#: js/ui/calendar.js:71
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "水"

 #. Translators: Calendar grid abbreviation for Thursday
-#: js/ui/calendar.js:78
+#: js/ui/calendar.js:73
 msgctxt "grid thursday"
 msgid "T"
 msgstr "木"

 #. Translators: Calendar grid abbreviation for Friday
-#: js/ui/calendar.js:80
+#: js/ui/calendar.js:75
 msgctxt "grid friday"
 msgid "F"
 msgstr "金"

 #. Translators: Calendar grid abbreviation for Saturday
-#: js/ui/calendar.js:82
+#: js/ui/calendar.js:77
 msgctxt "grid saturday"
 msgid "S"
 msgstr "土"
@ -847,7 +835,7 @@ msgstr "土"
 #. * "%OB" is the new format specifier introduced in glibc 2.27,
 #. * in most cases you should not change it.
 #.
-#: js/ui/calendar.js:397
+#: js/ui/calendar.js:392
 msgid "%OB"
 msgstr "%B"

@ -860,61 +848,37 @@ msgstr "%B"
 #. * in most cases you should not use the old "%B" here unless you
 #. * absolutely know what you are doing.
 #.
-#: js/ui/calendar.js:407
+#: js/ui/calendar.js:402
 msgid "%OB %Y"
 msgstr "%Y年%B"

-#: js/ui/calendar.js:466
+#: js/ui/calendar.js:461
 msgid "Previous month"
 msgstr "先月"

-#: js/ui/calendar.js:481
+#: js/ui/calendar.js:476
 msgid "Next month"
 msgstr "来月"

-#: js/ui/calendar.js:631
+#: js/ui/calendar.js:626
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"

-#: js/ui/calendar.js:687
+#: js/ui/calendar.js:682
 msgid "Week %V"
 msgstr "第 %V 週"

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: js/ui/calendar.js:762
-msgctxt "event list time"
-msgid "All Day"
-msgstr "終日"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: js/ui/calendar.js:900
-msgctxt "calendar heading"
-msgid "%A, %B %-d"
-msgstr "%B%-e日 (%a)"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: js/ui/calendar.js:903
-msgctxt "calendar heading"
-msgid "%A, %B %-d, %Y"
-msgstr "%Y年%B%-e日 (%a)"
-
-#: js/ui/calendar.js:1133
+#: js/ui/calendar.js:895
 msgid "No Notifications"
 msgstr "通知なし"

-#: js/ui/calendar.js:1136
-msgid "No Events"
-msgstr "イベントなし"
-
-#: js/ui/calendar.js:1190
+#: js/ui/calendar.js:949
 msgid "Do Not Disturb"
 msgstr "通知ポップアップを表示しない"

-#: js/ui/calendar.js:1209
+#: js/ui/calendar.js:968
 msgid "Clear"
 msgstr "消去"

@ -1066,7 +1030,7 @@ msgstr "申し訳ありません、認証できませんでした。再試行し
 msgid "%s is now known as %s"
 msgstr "%s は %s になりました"

-#: js/ui/ctrlAltTab.js:21 js/ui/viewSelector.js:177
+#: js/ui/ctrlAltTab.js:21 js/ui/viewSelector.js:178
 msgid "Windows"
 msgstr "ウィンドウ"

@ -1085,7 +1049,7 @@ msgstr "ダッシュボード"
 #. * "Tue 9:29 AM").  The string itself should become a full date, e.g.,
 #. * "February 17 2015".
 #.
-#: js/ui/dateMenu.js:75
+#: js/ui/dateMenu.js:79
 msgid "%B %-d %Y"
 msgstr "%Y年%-m月%-e日"

@ -1093,35 +1057,67 @@ msgstr "%Y年%-m月%-e日"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: js/ui/dateMenu.js:82
+#: js/ui/dateMenu.js:86
 msgid "%A %B %e %Y"
 msgstr "%Y年%-m月%-e日 (%a)"

-#: js/ui/dateMenu.js:161
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: js/ui/dateMenu.js:151
+msgctxt "calendar heading"
+msgid "%B %-d"
+msgstr "%-m月%-e日"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: js/ui/dateMenu.js:154
+msgctxt "calendar heading"
+msgid "%B %-d %Y"
+msgstr "%Y年%-m月%-e日"
+
+#: js/ui/dateMenu.js:160
+msgid "Today"
+msgstr "今日"
+
+#: js/ui/dateMenu.js:164
+msgid "Tomorrow"
+msgstr "明日"
+
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: js/ui/dateMenu.js:180
+msgctxt "event list time"
+msgid "All Day"
+msgstr "終日"
+
+#: js/ui/dateMenu.js:231
+msgid "No Events"
+msgstr "イベントなし"
+
+#: js/ui/dateMenu.js:348
 msgid "Add world clocks…"
 msgstr "世界時計を追加…"

-#: js/ui/dateMenu.js:162
+#: js/ui/dateMenu.js:349
 msgid "World Clocks"
 msgstr "世界時計"

-#: js/ui/dateMenu.js:424
+#: js/ui/dateMenu.js:629
 msgid "Loading…"
 msgstr "読み込み中…"

-#: js/ui/dateMenu.js:434
+#: js/ui/dateMenu.js:639
 msgid "Go online for weather information"
 msgstr "気象情報取得のためにネットワークに接続してください"

-#: js/ui/dateMenu.js:436
+#: js/ui/dateMenu.js:641
 msgid "Weather information is currently unavailable"
 msgstr "気象情報を取得できません"

-#: js/ui/dateMenu.js:446
+#: js/ui/dateMenu.js:651
 msgid "Weather"
 msgstr "天気"

-#: js/ui/dateMenu.js:448
+#: js/ui/dateMenu.js:653
 msgid "Select weather location…"
 msgstr "天気の場所を選択…"

@ -1279,11 +1275,11 @@ msgstr "拡張機能をインストール"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "extensions.gnome.org から“%s”をダウンロードしてインストールしますか?"

-#: js/ui/extensionSystem.js:251
+#: js/ui/extensionSystem.js:252
 msgid "Extension Updates Available"
 msgstr "拡張機能のアップデートが利用可能です"

-#: js/ui/extensionSystem.js:252
+#: js/ui/extensionSystem.js:253
 msgid "Extension updates are ready to be installed."
 msgstr "拡張機能のアップデートをインストールする準備ができました。"

@ -1410,6 +1406,7 @@ msgid "Disabled"
 msgstr "無効"

 #: js/ui/lookingGlass.js:743
+#: subprojects/extensions-app/data/ui/extension-row.ui:188
 msgid "Error"
 msgstr "エラー"

@ -1453,11 +1450,11 @@ msgstr "画面ロックには GNOME ディスプレイマネージャーが必
 msgid "System Information"
 msgstr "システム情報"

-#: js/ui/mpris.js:199
+#: js/ui/mpris.js:203
 msgid "Unknown artist"
 msgstr "不明なアーティスト"

-#: js/ui/mpris.js:209
+#: js/ui/mpris.js:213
 msgid "Unknown title"
 msgstr "不明なタイトル"

@ -1503,23 +1500,23 @@ msgstr "キーストロークを割り当て"
 msgid "Done"
 msgstr "完了"

-#: js/ui/padOsd.js:745
+#: js/ui/padOsd.js:732
 msgid "Edit…"
 msgstr "編集…"

-#: js/ui/padOsd.js:787 js/ui/padOsd.js:910
+#: js/ui/padOsd.js:774 js/ui/padOsd.js:891
 msgid "None"
 msgstr "なし"

-#: js/ui/padOsd.js:863
+#: js/ui/padOsd.js:845
 msgid "Press a button to configure"
 msgstr "ボタンを押して設定してください"

-#: js/ui/padOsd.js:864
+#: js/ui/padOsd.js:846
 msgid "Press Esc to exit"
 msgstr "Esc を押すと終了します"

-#: js/ui/padOsd.js:867
+#: js/ui/padOsd.js:849
 msgid "Press any key to exit"
 msgstr "キーを押すと終了します"

@ -1529,16 +1526,16 @@ msgstr "終了"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:432
+#: js/ui/panel.js:435
 msgid "Activities"
 msgstr "アクティビティ"

-#: js/ui/panel.js:711
+#: js/ui/panel.js:714
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "システム"

-#: js/ui/panel.js:824
+#: js/ui/panel.js:827
 msgid "Top Bar"
 msgstr "トップバー"

@ -1577,15 +1574,15 @@ msgstr "ロックできません"
 msgid "Lock was blocked by an application"
 msgstr "アプリケーションによってロックがブロックされました"

-#: js/ui/search.js:702
+#: js/ui/search.js:823
 msgid "Searching…"
 msgstr "検索中…"

-#: js/ui/search.js:704
+#: js/ui/search.js:825
 msgid "No results."
 msgstr "一致するものがありません。"

-#: js/ui/search.js:830
+#: js/ui/search.js:951
 #, javascript-format
 msgid "%d more"
 msgid_plural "%d more"
@ -1782,17 +1779,17 @@ msgstr "位置情報サービス無効"
 msgid "Enable"
 msgstr "有効"

-#: js/ui/status/location.js:355
+#: js/ui/status/location.js:350
 msgid "Allow location access"
 msgstr "位置情報へのアクセスの許可"

 #. Translators: %s is an application name
-#: js/ui/status/location.js:357
+#: js/ui/status/location.js:352
 #, javascript-format
 msgid "The app %s wants to access your location"
 msgstr "アプリ %s が位置情報へのアクセスを要求しています"

-#: js/ui/status/location.js:367
+#: js/ui/status/location.js:362
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "位置情報のアクセス許可設定は、プライバシー設定からいつでも変更できます。"
@ -2123,11 +2120,11 @@ msgstr "Thunderbolt 認証エラー"
 msgid "Could not authorize the Thunderbolt device: %s"
 msgstr "Thunderbolt デバイスを認証できませんでした: %s"

-#: js/ui/status/volume.js:151
+#: js/ui/status/volume.js:154
 msgid "Volume changed"
 msgstr "音量変更しました"

-#: js/ui/status/volume.js:222
+#: js/ui/status/volume.js:225
 msgid "Volume"
 msgstr "音量"

@ -2181,11 +2178,11 @@ msgstr "ロック解除"
 msgid "Log in as another user"
 msgstr "別のユーザーでログイン"

-#: js/ui/viewSelector.js:181
+#: js/ui/viewSelector.js:182
 msgid "Applications"
 msgstr "アプリケーション"

-#: js/ui/viewSelector.js:185
+#: js/ui/viewSelector.js:186
 msgid "Search"
 msgstr "検索"

@ -2335,19 +2332,19 @@ msgstr "認証ダイアログはユーザーに拒否されました"

 #: subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in:5
 #: subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in:4
-#: subprojects/extensions-app/js/main.js:182
+#: subprojects/extensions-app/js/main.js:183
 #: subprojects/extensions-app/data/ui/extensions-window.ui:61
 msgid "Extensions"
 msgstr "拡張機能"

 #: subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in:6
-#: subprojects/extensions-app/js/main.js:183
+#: subprojects/extensions-app/js/main.js:184
 msgid "Manage your GNOME Extensions"
 msgstr "GNOME 拡張機能を管理します"

 #: subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in:17
 msgid "The GNOME Project"
-msgstr ""
+msgstr "The GNOME Project"

 #: subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in:36
 msgid ""
@ -2359,23 +2356,23 @@ msgstr ""
 msgid "Configure GNOME Shell Extensions"
 msgstr "GNOME Shell 拡張機能の設定を行います"

-#: subprojects/extensions-app/js/main.js:144
+#: subprojects/extensions-app/js/main.js:145
 #, javascript-format
 msgid "Remove “%s”?"
 msgstr "“%s”を削除しますか?"

-#: subprojects/extensions-app/js/main.js:145
+#: subprojects/extensions-app/js/main.js:146
 msgid ""
 "If you remove the extension, you need to return to download it if you want "
 "to enable it again"
 msgstr ""
 "拡張機能を削除した場合、再度有効にするにはダウンロードし直す必要があります"

-#: subprojects/extensions-app/js/main.js:149
+#: subprojects/extensions-app/js/main.js:150
 msgid "Remove"
 msgstr "削除"

-#: subprojects/extensions-app/js/main.js:181
+#: subprojects/extensions-app/js/main.js:182
 msgid "translator-credits"
 msgstr ""
 "Hideki Yamane <henrich@debian.org>\n"
@ -2389,32 +2386,40 @@ msgstr ""
 "Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
 "Yoji TOYODA <bsyamato@sea.plala.or.jp>"

-#: subprojects/extensions-app/js/main.js:313
+#: subprojects/extensions-app/js/main.js:314
 #, javascript-format
 msgid "%d extension will be updated on next login."
 msgid_plural "%d extensions will be updated on next login."
 msgstr[0] "%d 個の拡張機能を次回ログイン時に更新します。"

-#: subprojects/extensions-app/data/ui/extension-row.ui:100
-#: subprojects/extensions-tool/src/command-create.c:301
+#: subprojects/extensions-app/js/main.js:461
+msgid "The extension is incompatible with the current GNOME version"
+msgstr "現在の GNOME のバージョンと互換性のない拡張機能です"
+
+#: subprojects/extensions-app/js/main.js:464
+msgid "The extension had an error"
+msgstr "拡張機能にエラーがありました"
+
+#: subprojects/extensions-app/data/ui/extension-row.ui:109
+#: subprojects/extensions-tool/src/command-create.c:325
 #: subprojects/extensions-tool/src/main.c:241
 msgid "Description"
 msgstr "説明"

-#: subprojects/extensions-app/data/ui/extension-row.ui:123
+#: subprojects/extensions-app/data/ui/extension-row.ui:132
 #: subprojects/extensions-tool/src/main.c:253
 msgid "Version"
 msgstr "バージョン"

-#: subprojects/extensions-app/data/ui/extension-row.ui:151
+#: subprojects/extensions-app/data/ui/extension-row.ui:160
 msgid "Author"
 msgstr "作者"

-#: subprojects/extensions-app/data/ui/extension-row.ui:175
+#: subprojects/extensions-app/data/ui/extension-row.ui:216
 msgid "Website"
 msgstr "ウェブサイト"

-#: subprojects/extensions-app/data/ui/extension-row.ui:192
+#: subprojects/extensions-app/data/ui/extension-row.ui:233
 msgid "Remove…"
 msgstr "削除…"

@ -2470,94 +2475,94 @@ msgstr ""

 #: subprojects/extensions-app/data/ui/extensions-window.ui:273
 msgid "Extension Updates Ready"
-msgstr "拡張機能を更新できます"
+msgstr "拡張機能の更新準備完了"

 #: subprojects/extensions-app/data/ui/extensions-window.ui:289
 msgid "Log Out…"
 msgstr "ログアウト…"

 #. Translators: a file path to an extension directory
-#: subprojects/extensions-tool/src/command-create.c:202
+#: subprojects/extensions-tool/src/command-create.c:226
 #, c-format
 msgid "The new extension was successfully created in %s.\n"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:275
+#: subprojects/extensions-tool/src/command-create.c:299
 #, c-format
 msgid ""
 "Name should be a very short (ideally descriptive) string.\n"
 "Examples are: %s"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:281
+#: subprojects/extensions-tool/src/command-create.c:305
 #: subprojects/extensions-tool/src/main.c:238
 msgid "Name"
 msgstr "名前"

-#: subprojects/extensions-tool/src/command-create.c:295
+#: subprojects/extensions-tool/src/command-create.c:319
 #, c-format
 msgid ""
 "Description is a single-sentence explanation of what your extension does.\n"
 "Examples are: %s"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:315
+#: subprojects/extensions-tool/src/command-create.c:339
 msgid ""
 "UUID is a globally-unique identifier for your extension.\n"
 "This should be in the format of an email address (clicktofocus@janedoe."
 "example.com)\n"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:342
+#: subprojects/extensions-tool/src/command-create.c:366
 msgid "Choose one of the available templates:\n"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:356
+#: subprojects/extensions-tool/src/command-create.c:380
 msgid "Template"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:411
+#: subprojects/extensions-tool/src/command-create.c:435
 msgid "The unique identifier of the new extension"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:414
+#: subprojects/extensions-tool/src/command-create.c:438
 msgid "NAME"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:415
+#: subprojects/extensions-tool/src/command-create.c:439
 msgid "The user-visible name of the new extension"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:417
+#: subprojects/extensions-tool/src/command-create.c:441
 msgid "DESCRIPTION"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:419
+#: subprojects/extensions-tool/src/command-create.c:443
 msgid "A short description of what the extension does"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:422
+#: subprojects/extensions-tool/src/command-create.c:446
 msgid "TEMPLATE"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:423
+#: subprojects/extensions-tool/src/command-create.c:447
 msgid "The template to use for the new extension"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:429
+#: subprojects/extensions-tool/src/command-create.c:453
 msgid "Enter extension information interactively"
 msgstr ""

-#: subprojects/extensions-tool/src/command-create.c:437
+#: subprojects/extensions-tool/src/command-create.c:461
 msgid "Create a new extension"
 msgstr "新しい拡張機能を作成します"

-#: subprojects/extensions-tool/src/command-create.c:455
+#: subprojects/extensions-tool/src/command-create.c:479
 #: subprojects/extensions-tool/src/command-list.c:172
 msgid "Unknown arguments"
 msgstr "不明な引数です"

-#: subprojects/extensions-tool/src/command-create.c:480
+#: subprojects/extensions-tool/src/command-create.c:504
 msgid "UUID, name and description are required"
 msgstr ""

@ -2877,6 +2882,23 @@ msgstr[0] "入力数: %u"
 msgid "System Sounds"
 msgstr "システムのサウンド"

+#~ msgid "Frequently used applications will appear here"
+#~ msgstr "よく使用するアプリケーションがここに表示されます"
+
+#~ msgid "Frequent"
+#~ msgstr "常用"
+
+#~ msgid "All"
+#~ msgstr "すべて"
+
+#~ msgctxt "calendar heading"
+#~ msgid "%A, %B %-d"
+#~ msgstr "%B%-e日 (%a)"
+
+#~ msgctxt "calendar heading"
+#~ msgid "%A, %B %-d, %Y"
+#~ msgstr "%Y年%B%-e日 (%a)"
+
 #~ msgid "Copy Error"
 #~ msgstr "エラーをコピー"

--- a/po/kk.po
+++ b/po/kk.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/Show More
+++ b/Show More