Enable desktop controls, fix logotype animation bug, merge master