Prevent discordant state between Workspace and Launcher (issue 15409018)

Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3
2 files changed