Merge remote-tracking branch 'upstream/bug-975156-fx-desktop-pages' into bug-975156-fx-desktop-pages