Merge "Move desktop variables to the right place" into main