am e25c5d1c: Prevent discordant state between Workspace and Launcher (issue 15409018)

* commit 'e25c5d1c94949044c4cd7416f60ea0dc12dadc8d':
  Prevent discordant state between Workspace and Launcher (issue 15409018)