Edits related to desktop shortcuts

Change-Id: I71e341e8aa95c096c34ee8c70072e284c0271a5c