merge evolution 3.12 changes from evolution-tray. adapt src to 3.12 changes